Merge pull request #262 from mvertens/feature/add_tests

add BLOM regression test functionality
NorESMhub · Aug 1, 2023 · 2bb8e7c · 2bb8e7c
2 parents 0a389fe + 537fb01
commit 2bb8e7c
Show file tree

Hide file tree

Showing 9 changed files with 781 additions and 638 deletions.
diff --git a/cime_config/buildnml b/cime_config/buildnml
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
@@ -211,7 +211,7 @@
     <valid_values>TRUE,FALSE</valid_values>
     <default_value>FALSE</default_value>
     <values>
-      <value compset="%VSLSC">TRUE</value>
+      <value compset="BGC%.*BRF.*">TRUE</value>
     </values>
     <group>build_component_blom</group>
     <file>env_build.xml</file>

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -4,9 +4,9 @@
 
   <help>
     =========================================
-    compset naming convention 
+    compset naming convention
     =========================================
-    The compset longname below has the specified order 
+    The compset longname below has the specified order
     atm, lnd, ice, ocn, river, glc wave cesm-options
 
     The notation for the compset longname is
@@ -20,24 +20,33 @@
     ROF  = [RTM, SROF]
     GLC  = [CISM1, CISM2, SGLC]
     WAV  = [SWAV]
-    BGC  = optional BGC scenario 
+    BGC  = optional BGC scenario
 
     The OPTIONAL %phys attributes specify submodes of the given system
     For example DOCN%DOM is the data ocean model for DOCN
-    ALL the possible %phys choices for each component are listed 
+    ALL the possible %phys choices for each component are listed
     with the -list command for create_newcase
-    ALL data models must have a %phys option that corresponds to the data  model mode 
+    ALL data models must have a %phys option that corresponds to the data  model mode
 
     Each compset node is associated with the following elements
-    - lname      
-    - alias        
+    - lname
+    - alias
     - support  (optional description of the support level for this compset)
     Each compset node can also have the following attributes
     - grid  (optional regular expression match for grid to work with the compset)
   </help>
 
   <compset>
-    <alias>NOINY</alias>   
+    <alias>NOINY_WW3</alias>
+    <lname>2000_DATM%NYF_SLND_CICE_BLOM_DROF%NYF_SGLC_WW3DEV</lname>
+  </compset>
+  <compset>
+    <alias>NOINYOC_WW3</alias>
+    <lname>2000_DATM%NYF_SLND_CICE_BLOM%ECO_DROF%NYF_SGLC_WW3DEV</lname>
+  </compset>
+
+  <compset>
+    <alias>NOINY</alias>
     <lname>2000_DATM%NYF_SLND_CICE_BLOM_DROF%NYF_SGLC_SWAV</lname>
     <science_support grid="T62_tn14"/>
     <science_support grid="T62_tn21"/>
@@ -107,5 +116,3 @@
   </entries>
 
 </compsets>
-
-
diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
@@ -118,14 +118,14 @@
       <pes pesize="M" compset="_DATM.*_BLOM%ECO">
         <comment>none</comment>
         <ntasks>
-          <ntasks_atm>1</ntasks_atm>
-          <ntasks_rof>1</ntasks_rof>
-          <ntasks_ice>96</ntasks_ice>
+          <ntasks_atm>128</ntasks_atm>
+          <ntasks_rof>128</ntasks_rof>
+          <ntasks_ice>128</ntasks_ice>
           <ntasks_ocn>354</ntasks_ocn>
-          <ntasks_cpl>126</ntasks_cpl>
-          <ntasks_lnd>1</ntasks_lnd>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1</ntasks_wav>
+          <ntasks_cpl>128</ntasks_cpl>
+          <ntasks_lnd>128</ntasks_lnd>
+          <ntasks_glc>128</ntasks_glc>
+          <ntasks_wav>128</ntasks_wav>
         </ntasks>
         <nthrds>
           <nthrds_atm>1</nthrds_atm>
@@ -138,11 +138,11 @@
           <nthrds_cpl>1</nthrds_cpl>
         </nthrds>
         <rootpe>
-          <rootpe_atm>96</rootpe_atm>
-          <rootpe_lnd>97</rootpe_lnd>
-          <rootpe_rof>98</rootpe_rof>
+          <rootpe_atm>0</rootpe_atm>
+          <rootpe_lnd>0</rootpe_lnd>
+          <rootpe_rof>0</rootpe_rof>
           <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>126</rootpe_ocn>
+          <rootpe_ocn>128</rootpe_ocn>
           <rootpe_glc>0</rootpe_glc>
           <rootpe_wav>0</rootpe_wav>
           <rootpe_cpl>0</rootpe_cpl>
@@ -155,14 +155,14 @@
       <pes pesize="M" compset="_DATM.*_BLOM%ECO">
         <comment>none</comment>
         <ntasks>
-          <ntasks_atm>192</ntasks_atm>
-          <ntasks_rof>192</ntasks_rof>
-          <ntasks_ice>192</ntasks_ice>
+          <ntasks_atm>128</ntasks_atm>
+          <ntasks_rof>128</ntasks_rof>
+          <ntasks_ice>128</ntasks_ice>
           <ntasks_ocn>354</ntasks_ocn>
-          <ntasks_cpl>192</ntasks_cpl>
-          <ntasks_lnd>1</ntasks_lnd>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1</ntasks_wav>
+          <ntasks_cpl>128</ntasks_cpl>
+          <ntasks_lnd>128</ntasks_lnd>
+          <ntasks_glc>128</ntasks_glc>
+          <ntasks_wav>128</ntasks_wav>
         </ntasks>
         <nthrds>
           <nthrds_atm>1</nthrds_atm>
@@ -179,7 +179,7 @@
           <rootpe_lnd>0</rootpe_lnd>
           <rootpe_rof>0</rootpe_rof>
           <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>192</rootpe_ocn>
+          <rootpe_ocn>128</rootpe_ocn>
           <rootpe_glc>0</rootpe_glc>
           <rootpe_wav>0</rootpe_wav>
           <rootpe_cpl>0</rootpe_cpl>