Fix atmaero resources and turn test on for cheyenne.intel (replaces PR …

…#1273) (#1291) * adjust atmaero_resources *add default atmaero resources add test on cheyenne
ufs-community · Jun 27, 2022 · 9fd9d1c · 9fd9d1c
1 parent 43f31ca
commit 9fd9d1c
Show file tree

Hide file tree

Showing 12 changed files with 3,416 additions and 3,366 deletions.
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -9,6 +9,8 @@
 
   THRD=1
 
+  TASKS_atmaero=198; INPES_atmaero=4; JNPES_atmaero=8; WPG_atmaero=6
+
   TASKS_cpl_atmw=180; THRD_cpl_atmw=1
   INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6
   WAV_tasks_atmw=30

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -220,4 +220,4 @@ RUN     | control_atmwav
 ###################################################################################################################################################################################
 
 COMPILE | -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON                                                                 | - wcoss_cray wcoss2.intel                 | fv3 |
-RUN     | atmaero_control_p8                                                                                                    | - wcoss_cray wcoss2.intel cheyenne.intel  | fv3 |
+RUN     | atmaero_control_p8                                                                                                    | - wcoss_cray wcoss2.intel                 | fv3 |
diff --git a/tests/tests/atmaero_control_p8 b/tests/tests/atmaero_control_p8
@@ -71,6 +71,11 @@ export atm_model='fv3'
 export chm_model='gocart'
 export coupling_interval_sec=${DT_ATMOS}
 
+export TASKS=${TASKS_atmaero}
+export INPES=${INPES_atmaero}
+export JNPES=${JNPES_atmaero}
+export WRTTASK_PER_GROUP=${WPG_atmaero}
+
 # default resources
 export DOMAINS_STACK_SIZE=8000000