Add fixed_NtoC settings file for testing

Also generate the 4p2z settings file from JSON as part of testing
mnlevy1981 · May 25, 2024 · f771fd6 · f771fd6
1 parent e04257d
commit f771fd6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/MARBL_tools/run_test_suite.sh b/MARBL_tools/run_test_suite.sh
@@ -77,7 +77,7 @@ cd ${MARBL_ROOT}/MARBL_tools
 (set -x ; ./MARBL_generate_settings_file.py)
 STATUS=$(check_return $?)
 print_status "MARBL_generate_settings_file.py" >> ${RESULTS_CACHE}
-for shortname in cesm2.0 cesm2.1 cesm2.1+cocco latest latest+cocco; do
+for shortname in cesm2.0 cesm2.1 cesm2.1+cocco latest latest+cocco latest+4p2z; do
   (set -x ; ./MARBL_generate_settings_file.py -f ../defaults/json/settings_${shortname}.json -o marbl_${shortname}.settings)
   STATUS=$(check_return $?)
   print_status "MARBL_generate_settings_file.py (${shortname})" >> ${RESULTS_CACHE}
@@ -141,7 +141,7 @@ if [ "${STATUS}" == "PASS" ]; then
     print_status "init.py ($(basename ${settingsfile}))" >> ${RESULTS_CACHE}
   done
   # Initialize MARBL with settings generated from every JSON file
-  for shortname in cesm2.0 cesm2.1 cesm2.1+cocco latest latest+cocco; do
+  for shortname in cesm2.0 cesm2.1 cesm2.1+cocco latest latest+cocco latest+4p2z; do
     if [ -f ../../../MARBL_tools/marbl_${shortname}.settings ]; then
       (set -x ; ./init.py -s ../../../MARBL_tools/marbl_${shortname}.settings)
       STATUS=$(check_return $?)

diff --git a/tests/input_files/settings/marbl_with_4p2z_cgs.settings b/tests/input_files/settings/marbl_with_4p2z_cgs.settings
@@ -215,9 +215,9 @@ autotroph_settings(4)%NOpt = 0.4
 autotroph_settings(4)%Nfixer = .false.
 autotroph_settings(4)%PCref_per_day = 4.7
 autotroph_settings(4)%POpt = 0.8
-autotroph_settings(4)%Qn_fixed =   9.9999999999999995e+33
+autotroph_settings(4)%Qn_fixed =   1.3675213675213677e-01
 autotroph_settings(4)%Qp_fixed =   8.5470085470085479e-03
-autotroph_settings(4)%SiOpt =   9.9999999999999995e+33
+autotroph_settings(4)%SiOpt = 0.0
 autotroph_settings(4)%agg_rate_max = 0.5
 autotroph_settings(4)%agg_rate_min = 0.01
 autotroph_settings(4)%alphaPI_per_day = 0.31

diff --git a/tests/input_files/settings/marbl_with_4p2z_mks.settings b/tests/input_files/settings/marbl_with_4p2z_mks.settings
@@ -215,9 +215,9 @@ autotroph_settings(4)%NOpt = 0.4
 autotroph_settings(4)%Nfixer = .false.
 autotroph_settings(4)%PCref_per_day = 4.7
 autotroph_settings(4)%POpt = 0.8
-autotroph_settings(4)%Qn_fixed =   9.9999999999999995e+33
+autotroph_settings(4)%Qn_fixed =   1.3675213675213677e-01
 autotroph_settings(4)%Qp_fixed =   8.5470085470085479e-03
-autotroph_settings(4)%SiOpt =   9.9999999999999995e+33
+autotroph_settings(4)%SiOpt = 0.0
 autotroph_settings(4)%agg_rate_max = 0.5
 autotroph_settings(4)%agg_rate_min = 0.01
 autotroph_settings(4)%alphaPI_per_day = 0.31

diff --git a/tests/input_files/settings/marbl_with_fixed_NtoC.settings b/tests/input_files/settings/marbl_with_fixed_NtoC.settings
@@ -0,0 +1 @@
+lvariable_NtoC = .false.