Merge pull request #13 from ufs-community/develop

Update2020 01 (#23)
DeniseWorthen · Feb 1, 2020 · 56e42ca · 56e42ca
2 parents 06506f2 + dd1bb0c
commit 56e42ca
Show file tree

Hide file tree

Showing 5 changed files with 398 additions and 2,305 deletions.
diff --git a/compsets/all.input b/compsets/all.input
@@ -9,6 +9,9 @@ run cpld_fv3_384_mom6_cice_cold_atm_flux @ fv3, coupledapp, cold384
 run cpld_fv3_mom6_cice_2d_atm_flux @ fv3, coupledapp, warm
 run cpld_fv3_384_mom6_cice_2d_atm_flux @ fv3, coupledapp, warm384
 
+run cpld_fv3_mom6_cice_2d_2threads @ fv3, coupledapp, warm
+run cpld_fv3_mom6_cice_2d_decomp @ fv3, coupledapp, warm
+
 ########################################################################
 #Run the Benchmark-like inputs for a single date 
 #These can be run separately from the baseline test cases 

diff --git a/compsets/fv3mom6cice5.input b/compsets/fv3mom6cice5.input
@@ -203,6 +203,28 @@ test cpld_fv3_mom6_cice_2d_atm_flux: fv3_mom6_cice.exe {
 
 } 
 ######################################################################## 
+# warm 2d c96 2 threads
+
+test cpld_fv3_mom6_cice_2d_2threads: fv3_mom6_cice.exe { 
+    use cpld_fv3_mom6_cice_2d_atm_flux 
+    use plat%default_cpl_threaded_resources
+    TEST_DESCR="Fully coupled FV3-MOM6-CICE system - 2 threads"
+    CNTL_NAME="RT-Baselines_2d_warm@[ATMRES]"
+    spawn execute {
+        {"@[build%target]", ranks="@[TASKS]", threads="@[THRD]" }
+    }
+} 
+######################################################################## 
+# warm 2d c96 decomp
+
+test cpld_fv3_mom6_cice_2d_decomp: fv3_mom6_cice.exe { 
+    use cpld_fv3_mom6_cice_2d_atm_flux 
+    TEST_DESCR="Fully coupled FV3-MOM6-CICE system - decomp"
+    CNTL_NAME="RT-Baselines_2d_warm@[ATMRES]"
+    INPES='6'
+    JNPES='4'
+} 
+######################################################################## 
 # cold c384
 
 test cpld_fv3_384_mom6_cice_cold_atm_flux: fv3_mom6_cice.exe { 

diff --git a/compsets/hera.input b/compsets/hera.input
@@ -61,19 +61,29 @@ platform hera.intel {
         WRTTASK_PER_GROUP=12
     }
     default_cpl={
-        #TASKS=320
-        TASKS=320
+        TASKS=318
         TPN=40
         INPES=3
         JNPES=8
         THRD=1
-        WRTTASK_PER_GROUP=8
+        WRTTASK_PER_GROUP=6
         med_petlist_bounds="0 143"
-        atm_petlist_bounds="0 151"
-        #ocn_petlist_bounds="150 271"
-        #ice_petlist_bounds="272 319"
-        ocn_petlist_bounds="152 271"
-        ice_petlist_bounds="272 319"
+        atm_petlist_bounds="0 149"
+        ocn_petlist_bounds="150 269"
+        ice_petlist_bounds="270 317"
+    }
+
+    default_cpl_threaded_resources={
+        TASKS=246
+        TPN=40
+        INPES=3
+        JNPES=4
+        THRD=2
+        WRTTASK_PER_GROUP=6
+        med_petlist_bounds="0 77"
+        atm_petlist_bounds="0 77"
+        ocn_petlist_bounds="78 197"
+        ice_petlist_bounds="198 245"
     }
 
     default_cpl_benchmark={
@@ -83,7 +93,7 @@ platform hera.intel {
         JNPES=8
         THRD=1
         WRTTASK_PER_GROUP=24
-        med_petlist_bounds="0 279"
+        med_petlist_bounds="0 287"
         atm_petlist_bounds="0 311"
         ocn_petlist_bounds="312 431"
         ice_petlist_bounds="432 479"