From cc1a1e2ffdcb9ae343e0f889535aaf6d0fc8019a Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Tue, 7 May 2024 11:07:41 -0400 Subject: [PATCH] modernize _prob_params to use string this removes old Fortran callbacks --- Exec/gravity_tests/StarGrav/_prob_params | 2 +- .../hse_convergence_general/_prob_params | 14 +++++++------- .../hydrostatic_adjust/_prob_params | 2 +- Exec/hydro_tests/test_convect/_prob_params | 2 +- Exec/hydro_tests/toy_convect/_prob_params | 2 +- Exec/radiation_tests/RadBreakout/_prob_params | 2 +- .../reacting_tests/reacting_bubble/_prob_params | 2 +- .../reacting_convergence/_prob_params | 12 ++++++------ Exec/science/bwp-rad/_prob_params | 2 +- Exec/science/convective_flame/_prob_params | 15 +++++++-------- Exec/science/flame/_prob_params | 17 ++++++++--------- Exec/science/flame_tube/_prob_params | 14 +++++++------- Exec/science/flame_wave/_prob_params | 14 +++++++------- Exec/science/massive_star/_prob_params | 2 +- Exec/science/nova/_prob_params | 2 +- Exec/science/planet/_prob_params | 2 +- Exec/science/subchandra/_prob_params | 2 +- Exec/science/xrb_layered/_prob_params | 2 +- Exec/science/xrb_mixed/_prob_params | 2 +- Exec/unit_tests/model_burner/_prob_params | 2 +- 20 files changed, 56 insertions(+), 58 deletions(-) diff --git a/Exec/gravity_tests/StarGrav/_prob_params b/Exec/gravity_tests/StarGrav/_prob_params index 1b043e43ed..d1d479d8b9 100644 --- a/Exec/gravity_tests/StarGrav/_prob_params +++ b/Exec/gravity_tests/StarGrav/_prob_params @@ -1,4 +1,4 @@ -model_name character "" y +model_name string "" y m_0 real 1.e30_rt y diff --git a/Exec/gravity_tests/hse_convergence_general/_prob_params b/Exec/gravity_tests/hse_convergence_general/_prob_params index 3362918c38..3647e400c3 100644 --- a/Exec/gravity_tests/hse_convergence_general/_prob_params +++ b/Exec/gravity_tests/hse_convergence_general/_prob_params @@ -14,19 +14,19 @@ H_star real 500.e0_rt y atm_delta real 25.e0_rt y -fuel1_name character "helium-4" y +fuel1_name string "helium-4" y -fuel2_name character "" y +fuel2_name string "" y -fuel3_name character "" y +fuel3_name string "" y -fuel4_name character "" y +fuel4_name string "" y -ash1_name character "iron-56" y +ash1_name string "iron-56" y -ash2_name character "" y +ash2_name string "" y -ash3_name character "" y +ash3_name string "" y fuel1_frac real 1.0_rt y diff --git a/Exec/gravity_tests/hydrostatic_adjust/_prob_params b/Exec/gravity_tests/hydrostatic_adjust/_prob_params index 7f50882129..dfcd01c1e1 100644 --- a/Exec/gravity_tests/hydrostatic_adjust/_prob_params +++ b/Exec/gravity_tests/hydrostatic_adjust/_prob_params @@ -1,6 +1,6 @@ prob_type integer 1 y -model_name character "" y +model_name string "" y hse_rho_top real 0.0_rt diff --git a/Exec/hydro_tests/test_convect/_prob_params b/Exec/hydro_tests/test_convect/_prob_params index 546f630a6f..8e96c2aa6c 100644 --- a/Exec/hydro_tests/test_convect/_prob_params +++ b/Exec/hydro_tests/test_convect/_prob_params @@ -1,4 +1,4 @@ -model_name character "" y +model_name string "" y apply_vel_field integer 0 y diff --git a/Exec/hydro_tests/toy_convect/_prob_params b/Exec/hydro_tests/toy_convect/_prob_params index 5e1b6ab214..f2bf4217d7 100644 --- a/Exec/hydro_tests/toy_convect/_prob_params +++ b/Exec/hydro_tests/toy_convect/_prob_params @@ -2,7 +2,7 @@ H_min real 1.e-4_rt y cutoff_density real 50.0_rt y -model_name character "" y +model_name string "" y apply_vel_field integer 0 y diff --git a/Exec/radiation_tests/RadBreakout/_prob_params b/Exec/radiation_tests/RadBreakout/_prob_params index ae414a6fed..6cc9007b99 100644 --- a/Exec/radiation_tests/RadBreakout/_prob_params +++ b/Exec/radiation_tests/RadBreakout/_prob_params @@ -7,7 +7,7 @@ rbasefac real 0.99e0_rt y filter_rhomax real -1.e20_rt y filter_timemax real -1.e20_rt y -model_file character "model.input" y +model_file string "model.input" y iye int -1 n iinvmu int -1 n diff --git a/Exec/reacting_tests/reacting_bubble/_prob_params b/Exec/reacting_tests/reacting_bubble/_prob_params index eefafd7cbc..1790add593 100644 --- a/Exec/reacting_tests/reacting_bubble/_prob_params +++ b/Exec/reacting_tests/reacting_bubble/_prob_params @@ -1,5 +1,5 @@ -model_name character "" y +model_name string "" y pert_temp_factor real 1.0_rt y diff --git a/Exec/reacting_tests/reacting_convergence/_prob_params b/Exec/reacting_tests/reacting_convergence/_prob_params index 75ea4508b4..90b2a6d686 100644 --- a/Exec/reacting_tests/reacting_convergence/_prob_params +++ b/Exec/reacting_tests/reacting_convergence/_prob_params @@ -13,17 +13,17 @@ p0 real 1.0_rt n xn_zone real 0.0_rt n nspec -spec1_name character "helium-4" y +spec1_name string "helium-4" y -spec2_name character "" y +spec2_name string "" y -spec3_name character "" y +spec3_name string "" y -spec4_name character "" y +spec4_name string "" y -spec5_name character "" y +spec5_name string "" y -spec6_name character "" y +spec6_name string "" y spec1_frac real 1.0_rt y diff --git a/Exec/science/bwp-rad/_prob_params b/Exec/science/bwp-rad/_prob_params index 7558b3bf57..c6918865aa 100644 --- a/Exec/science/bwp-rad/_prob_params +++ b/Exec/science/bwp-rad/_prob_params @@ -1 +1 @@ -model_name character "" y +model_name string "" y diff --git a/Exec/science/convective_flame/_prob_params b/Exec/science/convective_flame/_prob_params index 6d61d68dbe..a42ec2730c 100644 --- a/Exec/science/convective_flame/_prob_params +++ b/Exec/science/convective_flame/_prob_params @@ -10,7 +10,7 @@ cutoff_density real 1.e-8_rt y refine_cutoff_frac real 0.5_rt y -refine_cutoff_height real 0.0_rt +refine_cutoff_height real 0.0_rt T_hi real 5.e8_rt y @@ -24,17 +24,17 @@ H_star real 500e0_rt y atm_delta real 25.0e0_rt y -fuel1_name character "fuel" y +fuel1_name string "fuel" y -fuel2_name character "" y +fuel2_name string "" y -fuel3_name character "" y +fuel3_name string "" y -ash1_name character "inert" y +ash1_name string "inert" y -ash2_name character "" y +ash2_name string "" y -ash3_name character "" y +ash3_name string "" y fuel1_frac real 1.0_rt y @@ -51,4 +51,3 @@ ash3_frac real 0.0_rt y low_density_cutoff real 1.e-4_rt y smallx real 1.e-10_rt y - diff --git a/Exec/science/flame/_prob_params b/Exec/science/flame/_prob_params index 6f25859a0a..060d07dc5f 100644 --- a/Exec/science/flame/_prob_params +++ b/Exec/science/flame/_prob_params @@ -20,13 +20,13 @@ e_ash real 0.0_rt xn_ash real 0.0_rt n nspec -fuel1_name character "helium-4" y +fuel1_name string "helium-4" y -fuel2_name character "" y +fuel2_name string "" y -fuel3_name character "" y +fuel3_name string "" y -fuel4_name character "" y +fuel4_name string "" y X_fuel1 real 1.0_rt y @@ -36,13 +36,13 @@ X_fuel3 real 0.0_rt y X_fuel4 real 0.0_rt y -ash1_name character "oxygen-16" y +ash1_name string "oxygen-16" y -ash2_name character "" y +ash2_name string "" y -ash3_name character "" y +ash3_name string "" y -ash4_name character "" y +ash4_name string "" y X_ash1 real 1.0_rt y @@ -57,4 +57,3 @@ v_inflow real 0.0_rt y mass_flux real 0.0_rt smallx_init real 0.0_rt y - diff --git a/Exec/science/flame_tube/_prob_params b/Exec/science/flame_tube/_prob_params index dba7a81b8f..22f7a7cb7c 100644 --- a/Exec/science/flame_tube/_prob_params +++ b/Exec/science/flame_tube/_prob_params @@ -29,19 +29,19 @@ H_star real 500.e0_rt y atm_delta real 25.e0_rt y -fuel1_name character "helium-4" y +fuel1_name string "helium-4" y -fuel2_name character "" y +fuel2_name string "" y -fuel3_name character "" y +fuel3_name string "" y -fuel4_name character "" y +fuel4_name string "" y -ash1_name character "iron-56" y +ash1_name string "iron-56" y -ash2_name character "" y +ash2_name string "" y -ash3_name character "" y +ash3_name string "" y fuel1_frac real 1.0_rt y diff --git a/Exec/science/flame_wave/_prob_params b/Exec/science/flame_wave/_prob_params index dba7a81b8f..82014ed9b5 100644 --- a/Exec/science/flame_wave/_prob_params +++ b/Exec/science/flame_wave/_prob_params @@ -29,19 +29,19 @@ H_star real 500.e0_rt y atm_delta real 25.e0_rt y -fuel1_name character "helium-4" y +fuel1_name string "helium-4" y -fuel2_name character "" y +fuel2_name string "" y -fuel3_name character "" y +fuel3_name string "" y -fuel4_name character "" y +fuel4_name string "" y -ash1_name character "iron-56" y +ash1_name string "iron-56" y -ash2_name character "" y +ash2_name string "" y -ash3_name character "" y +ash3_name string "" y fuel1_frac real 1.0_rt y diff --git a/Exec/science/massive_star/_prob_params b/Exec/science/massive_star/_prob_params index 888bf80000..9263587e2d 100644 --- a/Exec/science/massive_star/_prob_params +++ b/Exec/science/massive_star/_prob_params @@ -1,4 +1,4 @@ -model_name character "" y +model_name string "" y interpolate_pres int 0 y diff --git a/Exec/science/nova/_prob_params b/Exec/science/nova/_prob_params index 81973cc0f0..600f18f965 100644 --- a/Exec/science/nova/_prob_params +++ b/Exec/science/nova/_prob_params @@ -1,5 +1,5 @@ -model_name character "" y +model_name string "" y apply_vel_field integer 0 y diff --git a/Exec/science/planet/_prob_params b/Exec/science/planet/_prob_params index 4c9787b400..f93376492c 100644 --- a/Exec/science/planet/_prob_params +++ b/Exec/science/planet/_prob_params @@ -1,6 +1,6 @@ cutoff_density real 50.0_rt y -model_name character "" y +model_name string "" y apply_vel_field integer 0 y diff --git a/Exec/science/subchandra/_prob_params b/Exec/science/subchandra/_prob_params index e546592e9f..e8433d26ae 100644 --- a/Exec/science/subchandra/_prob_params +++ b/Exec/science/subchandra/_prob_params @@ -1,5 +1,5 @@ # the name of the initial model -model_name character "model.hse" y +model_name string "model.hse" y # the distance from the base of the He layer star to put the perturbation R_pert real 1.e7_rt y diff --git a/Exec/science/xrb_layered/_prob_params b/Exec/science/xrb_layered/_prob_params index 116b508555..99a716b817 100644 --- a/Exec/science/xrb_layered/_prob_params +++ b/Exec/science/xrb_layered/_prob_params @@ -2,7 +2,7 @@ H_min real 1.e-4_rt y cutoff_density real 50.0_rt y -model_name character "" y +model_name string "" y apply_perturbation integer 1 y diff --git a/Exec/science/xrb_mixed/_prob_params b/Exec/science/xrb_mixed/_prob_params index 30b9d81ca9..0c3e96eec8 100644 --- a/Exec/science/xrb_mixed/_prob_params +++ b/Exec/science/xrb_mixed/_prob_params @@ -2,7 +2,7 @@ H_min real 1.e-4_rt y cutoff_density real 50.0_rt y -model_name character "" y +model_name string "" y apply_vel_field integer 0 y diff --git a/Exec/unit_tests/model_burner/_prob_params b/Exec/unit_tests/model_burner/_prob_params index 2f85da5c35..0c979e422c 100644 --- a/Exec/unit_tests/model_burner/_prob_params +++ b/Exec/unit_tests/model_burner/_prob_params @@ -1,4 +1,4 @@ -model_name character "" y +model_name string "" y burn_dt real 0.1_rt y