move the model_file paramter to the top-level _parameters (#66)

also update the benchmarks that were failing because of a previous rename to the model output

.github/workflows/ecsn.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Compare to stored output
         run: |
           cd ECSN
-          diff ECSN-ONe6040-final.hse.24414.06cm ci-benchmarks/ECSN-ONe6040-final.hse.24414.06cm
+          diff ECSN-ONe6040-final.hse.dx24414.06cm ci-benchmarks/ECSN-ONe6040-final.hse.dx24414.06cm
 
 
 

.github/workflows/lagrangian_planar.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Compare to stored output
         run: |
           cd lagrangian_planar
-          diff glasner_T7.hse.10000.00cm ci-benchmarks/glasner_T7.hse.10000.00cm
+          diff glasner_T7.hse.dx10000.00cm ci-benchmarks/glasner_T7.hse.dx10000.00cm
 
 
 

.github/workflows/low_mass_convective_star.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Compare to stored output
         run: |
           cd low_mass_convective_star
-          diff convective.hse.683.59km ci-benchmarks/convective.hse.683.59km
+          diff convective.hse.dx683.59km ci-benchmarks/convective.hse.dx683.59km
 
       - name: Run with irregular grid
         run: |

.github/workflows/massive_star.yml

@@ -45,12 +45,13 @@ jobs:
       - name: Run with regular grid
         run: |
           cd massive_star
+          ulimit -s 32768
           ./initialmodel1d.gnu.ex inputs problem.nx=16384
 
       - name: Compare to stored output
         run: |
           cd massive_star
-          diff 15m_500_sec.aprox19.hse.20.00km ci-benchmarks/15m_500_sec.aprox19.hse.20.00km
+          diff 15m_500_sec.aprox19.hse.dx20.00km ci-benchmarks/15m_500_sec.aprox19.hse.dx20.00km
 
 
 

.github/workflows/spherical.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Compare to stored output
         run: |
           cd spherical
-          diff WD_rhoc_2.e9_M_1.1.hse.2.00km ci-benchmarks/WD_rhoc_2.e9_M_1.1.hse.2.00km
+          diff WD_rhoc_2.e9_M_1.1.hse.dx2.00km ci-benchmarks/WD_rhoc_2.e9_M_1.1.hse.dx2.00km
 
 
 

.github/workflows/sub_chandra.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Compare to stored output
         run: |
           cd sub_chandra
-          diff sub_chandra.M_WD-1.10.M_He-0.050.delta50.00km.hse.CO.N14.10.00km ci-benchmarks/sub_chandra.M_WD-1.10.M_He-0.050.delta50.00km.hse.CO.N14.10.00km
+          diff sub_chandra.M_WD-1.10.M_He-0.050.delta50.00km.hse.CO.N14.dx10.00km ci-benchmarks/sub_chandra.M_WD-1.10.M_He-0.050.delta50.00km.hse.CO.N14.dx10.00km
 
 
 

.github/workflows/test2.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Compare to stored output
         run: |
           cd test2
-          diff model.hse.5.62km ci-benchmarks/model.hse.5.62km
+          diff model.hse.dx5.62km ci-benchmarks/model.hse.dx5.62km
 
 
 

ECSN/_parameters

@@ -1,7 +1,5 @@
 @namespace: problem
 
-model_file       character       "ECSN-ONe6040-final.raw"
-
 xmin             real            0.0
 
 xmax             real            2.5e8

_parameters

@@ -10,3 +10,6 @@ use_irreg_grid  int         0
 
 # number of points to use in the model
 nx              int         -1
+
+# initial model to read in
+model_file      character    ""

kepler_hybrid/_parameters

@@ -1,7 +1,5 @@
 @namespace: problem
 
-model_file           character    "kepler_new_6.25e8.raw"
-
 nx                   integer      1280
 
 smallx               real         1.e-10

lagrangian_planar/_parameters

@@ -1,7 +1,5 @@
 @namespace: problem
 
-model_file          character    "model.in"
-
 model_shift         real         0.0
 
 xmin                real         0.0

low_mass_convective_star/_parameters

@@ -18,5 +18,3 @@ M_tot                real         0.3
 
 prefix               character    "convective"
 
-# not used, but needed for the reader
-model_file           character    ""

massive_star/_parameters

@@ -1,7 +1,5 @@
 @namespace: problem
 
-model_file       character       "15m_500_sec.aprox19.dat"
-
 xmin             real            0.0
 
 xmax             real            1.75e10

read_model.H

@@ -101,10 +101,10 @@ write_model(std::string model_name,
         dx_str = "irreg";
     } else {
         Real dx = (xzn_hse(1) - xzn_hse(0));
-        dx_str = num_to_unitstring(dx);
+        dx_str = "dx" + num_to_unitstring(dx);
     }
 
-    outfile += ".dx" + dx_str;
+    outfile += "." + dx_str;
 
     std::cout << "writing " << model_name << " model to " << outfile << std::endl;
 

spherical/_parameters

@@ -19,5 +19,3 @@ cfrac        real        0.7
 
 prefix       character   "spherical"
 
-# not used, but needed for the reader
-model_file           character    ""

sub_chandra/_parameters

@@ -29,9 +29,6 @@ low_density_cutoff   real         1.e-4
 
 temp_fluff           real         1.e5
 
-# not used, but needed for the reader
-model_file           character    ""
-
 isothermal_layer     int          0
 
 # tol_hse is the tolerance used when iterating over a zone to

test2/_parameters

@@ -20,5 +20,3 @@ low_density_cutoff   real         1.e-4
 
 temp_fluff           real         1.e7
 
-# not used, but needed for the reader
-model_file           character    ""

toy_atm/_parameters

@@ -53,7 +53,3 @@ do_invsq_grav  integer      0
 low_density_cutoff  real    1.e-4
 
 smallx         real         1.e-10
-
-
-# not used, but needed for the reader
-model_file           character    ""