Change "CESM2+4p2z" -> "4p2z"

This isn't really a CESM2 configuration; at some point we may want to update it to be CESM3+4p2z, though.
marbl-ecosys · May 11, 2023 · ea4205e · ea4205e
1 parent a9b02b9
commit ea4205e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/MARBL_tools/MARBL_settings_file_class.py b/MARBL_tools/MARBL_settings_file_class.py
@@ -227,7 +227,7 @@ def _process_variable_value(self, category_name, variable_name):
         # Process derived type!
         # Check to see if PFT_defaults leads to specific PFT declarations
         if (category_name == "PFT_derived_types"):
-            for valid_PFT_default in ["CESM2", "CESM2+cocco", "CESM2+4p2z"]:
+            for valid_PFT_default in ["CESM2", "CESM2+cocco", "4p2z"]:
                 append_to_keys = 'PFT_defaults == "{}"'.format(valid_PFT_default) in self._config_keyword
                 if append_to_keys:
                     settings_key = '_{}_PFT_keys'.format(valid_PFT_default)

diff --git a/defaults/json/settings_latest+4p2z.json b/defaults/json/settings_latest+4p2z.json
@@ -1,10 +1,10 @@
 {
    "PFT_counts": {
       "autotroph_cnt": {
-         "cannot change": "PFT_defaults == 'CESM2+4p2z'",
+         "cannot change": "PFT_defaults == '4p2z'",
          "datatype": "integer",
          "default_value": {
-            "PFT_defaults == \"CESM2+4p2z\"": 4,
+            "PFT_defaults == \"4p2z\"": 4,
             "default": 1
          },
          "longname": "Number of autotroph classes",
@@ -15,7 +15,7 @@
       "max_grazer_prey_cnt": {
          "datatype": "integer",
          "default_value": {
-            "PFT_defaults == \"CESM2+4p2z\"": 4,
+            "PFT_defaults == \"4p2z\"": 4,
             "default": 1
          },
          "longname": "Number of grazer prey classes",
@@ -25,7 +25,7 @@
       "zooplankton_cnt": {
          "datatype": "integer",
          "default_value": {
-            "PFT_defaults == \"CESM2+4p2z\"": 2,
+            "PFT_defaults == \"4p2z\"": 2,
             "default": 1
          },
          "longname": "Number of zooplankton classes",
@@ -925,7 +925,7 @@
          "units": "mol m-2 yr-1"
       },
       "PFT_defaults": {
-         "_CESM2+4p2z_PFT_keys": {
+         "_4p2z_PFT_keys": {
             "autotroph_settings": [
                "sp",
                "diat",
@@ -949,12 +949,12 @@
          },
          "_append_to_config_keywords": true,
          "datatype": "string",
-         "default_value": "CESM2+4p2z",
+         "default_value": "4p2z",
          "longname": "Define how PFTs are initialized",
          "subcategory": "1. config PFTs",
          "units": "unitless",
          "valid_values": [
-            "CESM2+4p2z",
+            "4p2z",
             "user-specified"
          ]
       },

diff --git a/defaults/settings_latest+4p2z.yaml b/defaults/settings_latest+4p2z.yaml
@@ -198,11 +198,11 @@ general_parms :
       subcategory : 1. config PFTs
       units : unitless
       datatype : string
-      default_value : CESM2+4p2z
+      default_value : 4p2z
       valid_values :
-            - CESM2+4p2z
+            - 4p2z
             - user-specified
-      _CESM2+4p2z_PFT_keys :
+      _4p2z_PFT_keys :
          autotroph_settings :
             - sp
             - diat
@@ -653,8 +653,8 @@ PFT_counts :
       datatype : integer
       default_value :
          default : 1
-         PFT_defaults == "CESM2+4p2z" : 4
-      cannot change : PFT_defaults == 'CESM2+4p2z'
+         PFT_defaults == "4p2z" : 4
+      cannot change : PFT_defaults == '4p2z'
       must set : PFT_defaults == 'user-specified'
    zooplankton_cnt :
       longname : Number of zooplankton classes
@@ -663,15 +663,15 @@ PFT_counts :
       datatype : integer
       default_value :
          default : 1
-         PFT_defaults == "CESM2+4p2z" : 2
+         PFT_defaults == "4p2z" : 2
    max_grazer_prey_cnt :
       longname : Number of grazer prey classes
       subcategory : 1. config PFTs
       units : unitless
       datatype : integer
       default_value :
          default : 1
-         PFT_defaults == "CESM2+4p2z" : 4
+         PFT_defaults == "4p2z" : 4
 
 ################################################################################
 #                         Category 3: PFT_derived_types                        #

diff --git a/src/marbl_settings_mod.F90 b/src/marbl_settings_mod.F90
@@ -447,7 +447,7 @@ subroutine marbl_settings_set_defaults_PFT_counts(marbl_status_log)
     character(len=*), parameter :: subname = 'marbl_settings_mod:marbl_settings_set_defaults_PFT_counts'
     character(len=char_len)     :: log_message
 
-    if ((trim(PFT_defaults) .eq. 'CESM2+cocco') .or. (trim(PFT_defaults) .eq. 'CESM2+4p2z')) then
+    if ((trim(PFT_defaults) .eq. 'CESM2+cocco') .or. (trim(PFT_defaults) .eq. '4p2z')) then
       write(log_message, '(3A)') 'PFT_defaults = "', trim(PFT_defaults), &
                                  '" in input file, but being treated as "user-specified"'
       call marbl_status_log%log_noerror(log_message, subname)