Merge remote-tracking branch 'Rahul/feature/ufs-threading' into featu…

…re/nowarn
ufs-community · Mar 11, 2024 · db92ca0 · db92ca0
2 parents 85ab631 + 815cb22
commit db92ca0
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 13 deletions.
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -314,7 +314,7 @@ export DumpFields="false"
 export_fv3 ()
 {
 # ufs.configure defaults
-export UFS_CONFIGURE=ufs.configure.atm.IN
+export UFS_CONFIGURE=ufs.configure.atm_esmf.IN
 export MODEL_CONFIGURE=model_configure.IN
 export atm_model=fv3
 

diff --git a/tests/parm/ufs.configure.atm.IN b/tests/parm/ufs.configure.atm.IN
@@ -4,7 +4,7 @@
 
 # ESMF #
 logKindFlag:            @[esmf_logkind]
-globalResourceControl:  true
+globalResourceControl:  false
 
 # EARTH #
 EARTH_component_list: ATM
@@ -15,7 +15,6 @@ EARTH_attributes::
 # ATM #
 ATM_model:                      @[atm_model]
 ATM_petlist_bounds:             @[atm_petlist_bounds]
-ATM_omp_num_threads:            @[atm_omp_num_threads]
 ATM_attributes::
   Verbosity = 0
   Diagnostic = 0

diff --git a/tests/parm/ufs.configure.atm_esmf.IN b/tests/parm/ufs.configure.atm_esmf.IN
@@ -0,0 +1,27 @@
+#############################################
+####  UFS Run-Time Configuration File  ######
+#############################################
+
+# ESMF #
+logKindFlag:            @[esmf_logkind]
+globalResourceControl:  true
+
+# EARTH #
+EARTH_component_list: ATM
+EARTH_attributes::
+  Verbosity = 0
+::
+
+# ATM #
+ATM_model:                      @[atm_model]
+ATM_petlist_bounds:             @[atm_petlist_bounds]
+ATM_omp_num_threads:            @[atm_omp_num_threads]
+ATM_attributes::
+  Verbosity = 0
+  Diagnostic = 0
+::
+
+# Run Sequence #
+runSeq::
+  ATM
+::
diff --git a/tests/parm/ufs.configure.atmaero.IN b/tests/parm/ufs.configure.atmaero.IN
@@ -4,7 +4,7 @@
 
 # ESMF #
 logKindFlag:            @[esmf_logkind]
-globalResourceControl:  true
+globalResourceControl:  false
 
 # EARTH #
 EARTH_component_list: ATM CHM
@@ -15,15 +15,13 @@ EARTH_attributes::
 # ATM #
 ATM_model:                      @[atm_model]
 ATM_petlist_bounds:             @[atm_petlist_bounds]
-ATM_omp_num_threads:            @[atm_omp_num_threads]
 ATM_attributes::
   Verbosity = 0
 ::
 
 # CHM #
 CHM_model:                      @[chm_model]
 CHM_petlist_bounds:             @[chm_petlist_bounds]
-CHM_omp_num_threads:            @[chm_omp_num_threads]
 CHM_attributes::
   Verbosity = 0
 ::

diff --git a/tests/parm/ufs.configure.atmaero_esmf.IN b/tests/parm/ufs.configure.atmaero_esmf.IN
@@ -0,0 +1,40 @@
+#############################################
+####  UFS Run-Time Configuration File  ######
+#############################################
+
+# ESMF #
+logKindFlag:            @[esmf_logkind]
+globalResourceControl:  true
+
+# EARTH #
+EARTH_component_list: ATM CHM
+EARTH_attributes::
+  Verbosity = 0
+::
+
+# ATM #
+ATM_model:                      @[atm_model]
+ATM_petlist_bounds:             @[atm_petlist_bounds]
+ATM_omp_num_threads:            @[atm_omp_num_threads]
+ATM_attributes::
+  Verbosity = 0
+::
+
+# CHM #
+CHM_model:                      @[chm_model]
+CHM_petlist_bounds:             @[chm_petlist_bounds]
+CHM_omp_num_threads:            @[chm_omp_num_threads]
+CHM_attributes::
+  Verbosity = 0
+::
+
+# Run Sequence #
+runSeq::
+  @@[coupling_interval_sec]
+    ATM phase1
+    ATM -> CHM
+    CHM
+    CHM -> ATM
+    ATM phase2
+  @
+::
diff --git a/tests/parm/ufs.configure.leapfrog_atm_wav.IN b/tests/parm/ufs.configure.leapfrog_atm_wav.IN
@@ -4,7 +4,7 @@
 
 # ESMF #
 logKindFlag:            @[esmf_logkind]
-globalResourceControl:  true
+globalResourceControl:  false
 
 # EARTH #
 EARTH_component_list: ATM WAV
@@ -15,7 +15,6 @@ EARTH_attributes::
 # ATM #
 ATM_model:                      @[atm_model]
 ATM_petlist_bounds:             @[atm_petlist_bounds]
-ATM_omp_num_threads:            @[atm_omp_num_threads]
 ATM_attributes::
   Verbosity = 0
   DumpFields = @[DumpFields]
@@ -24,7 +23,6 @@ ATM_attributes::
 # WAV #
 WAV_model:                      @[wav_model]
 WAV_petlist_bounds:             @[wav_petlist_bounds]
-WAV_omp_num_threads:            @[wav_omp_num_threads]
 WAV_attributes::
   Verbosity = 0
 ::

diff --git a/tests/parm/ufs.configure.leapfrog_atm_wav_esmf.IN b/tests/parm/ufs.configure.leapfrog_atm_wav_esmf.IN
@@ -0,0 +1,41 @@
+#############################################
+####  UFS Run-Time Configuration File  ######
+#############################################
+
+# ESMF #
+logKindFlag:            @[esmf_logkind]
+globalResourceControl:  true
+
+# EARTH #
+EARTH_component_list: ATM WAV
+EARTH_attributes::
+  Verbosity = 0
+::
+
+# ATM #
+ATM_model:                      @[atm_model]
+ATM_petlist_bounds:             @[atm_petlist_bounds]
+ATM_omp_num_threads:            @[atm_omp_num_threads]
+ATM_attributes::
+  Verbosity = 0
+  DumpFields = @[DumpFields]
+::
+
+# WAV #
+WAV_model:                      @[wav_model]
+WAV_petlist_bounds:             @[wav_petlist_bounds]
+WAV_omp_num_threads:            @[wav_omp_num_threads]
+WAV_attributes::
+  Verbosity = 0
+::
+
+
+
+# Run Sequence #
+runSeq::
+  @@[coupling_interval_sec]
+    ATM
+    ATM -> WAV
+    WAV
+  @
+::
diff --git a/tests/tests/atmaero_control_p8 b/tests/tests/atmaero_control_p8
@@ -66,7 +66,7 @@ export WRITE_DOPOST=.true.
 
 export CPL=.true.
 export CPLCHM=.true.
-export UFS_CONFIGURE=ufs.configure.atmaero.IN
+export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN
 
 export atm_model='fv3'
 export chm_model='gocart'

diff --git a/tests/tests/atmaero_control_p8_rad b/tests/tests/atmaero_control_p8_rad
@@ -65,7 +65,7 @@ export WRITE_DOPOST=.true.
 
 export CPL=.true.
 export CPLCHM=.true.
-export UFS_CONFIGURE=ufs.configure.atmaero.IN
+export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN
 
 export atm_model='fv3'
 export chm_model='gocart'

diff --git a/tests/tests/atmaero_control_p8_rad_micro b/tests/tests/atmaero_control_p8_rad_micro
@@ -65,7 +65,7 @@ export WRITE_DOPOST=.true.
 
 export CPL=.true.
 export CPLCHM=.true.
-export UFS_CONFIGURE=ufs.configure.atmaero.IN
+export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN
 
 export atm_model='fv3'
 export chm_model='gocart'

diff --git a/tests/tests/control_c384gdas_wav b/tests/tests/control_c384gdas_wav
@@ -97,7 +97,7 @@ export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
 
 export CPL=.true.
 export CPLWAV=.true.
-export UFS_CONFIGURE="ufs.configure.leapfrog_atm_wav.IN"
+export UFS_CONFIGURE="ufs.configure.leapfrog_atm_wav_esmf.IN"
 export atm_model='fv3'
 export wav_model='ww3'
 export WW3OUTPUTTYPE=' 1'