Implement Dusan's ecflow fix ufs-community#273

MinsukJi-NOAA · Nov 18, 2020 · 31e3e88 · 31e3e88
1 parent 3cebcd4
commit 31e3e88
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 37 deletions.
diff --git a/tests/fv3_conf/compile_bsub.IN_wcoss_cray b/tests/fv3_conf/compile_bsub.IN_wcoss_cray
@@ -11,6 +11,11 @@
 
 set -eux
 
+set +x
+module load alps
+module list
+set -x
+
 echo "Compile started:  " `date`
 
 aprun -n 1 -j 1 -N 1 -d 24 @[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]

diff --git a/tests/fv3_conf/fv3_bsub.IN_wcoss_cray b/tests/fv3_conf/fv3_bsub.IN_wcoss_cray
@@ -15,7 +15,6 @@ set +x
 source ./module-setup.sh
 module use $( pwd -P )
 module load modules.fv3
-module load alps/5.2.3-2.0502.9295.14.14.ari
 module list
 set -x
 

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -110,14 +110,11 @@ export RT_COMPILER=${RT_COMPILER:-intel}
 source detect_machine.sh
 source rt_utils.sh
 
+source $PATHTR/NEMS/src/conf/module-setup.sh.inc
+
 if [[ $MACHINE_ID = wcoss_cray ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
   module load xt-lsfhpc
-
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
-
   module load python/3.6.3
 
   module use /usrx/local/emc_rocoto/modulefiles
@@ -150,12 +147,7 @@ if [[ $MACHINE_ID = wcoss_cray ]]; then
 
 elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
   module load lsf/10.1
-
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
-
   module load python/3.6.3
 
   module use /usrx/local/dev/emc_rocoto/modulefiles
@@ -183,8 +175,6 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
 
 elif [[ $MACHINE_ID = gaea.* ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
-
 #  export PATH=/gpfs/hps/nco/ops/ecf/ecfdir/ecflow.v4.1.0.intel/bin:$PATH
   export PYTHONPATH=
   ECFLOW_START=
@@ -206,11 +196,6 @@ elif [[ $MACHINE_ID = gaea.* ]]; then
 
 elif [[ $MACHINE_ID = hera.* ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
-
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
-
   module load rocoto
   ROCOTORUN=$(which rocotorun)
   ROCOTOSTAT=$(which rocotostat)
@@ -238,10 +223,6 @@ elif [[ $MACHINE_ID = hera.* ]]; then
 
 elif [[ $MACHINE_ID = orion.* ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
-
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
   module load gcc/8.3.0
 
   module load contrib rocoto/1.3.1
@@ -268,11 +249,6 @@ elif [[ $MACHINE_ID = orion.* ]]; then
 
 elif [[ $MACHINE_ID = jet.* ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
-
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
-
   module load rocoto/1.3.2
   ROCOTORUN=$(which rocotorun)
   ROCOTOSTAT=$(which rocotostat)
@@ -299,8 +275,6 @@ elif [[ $MACHINE_ID = jet.* ]]; then
 
 elif [[ $MACHINE_ID = cheyenne.* ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
-
   module load python/2.7.16
   export PATH=/glade/p/ral/jntp/tools/ecFlow-5.3.1/bin:$PATH
   export PYTHONPATH=/glade/p/ral/jntp/tools/ecFlow-5.3.1/lib/python2.7/site-packages
@@ -320,8 +294,6 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
 
 elif [[ $MACHINE_ID = stampede.* ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
-
   export PYTHONPATH=
   ECFLOW_START=
   QUEUE=skx-dev

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -368,16 +368,17 @@ rocoto_create_compile_task() {
 
   NATIVE=""
   BUILD_CORES=8
+  BUILD_WALLTIME="00:30:00"
   if [[ ${MACHINE_ID} == wcoss_dell_p3 ]]; then
     BUILD_CORES=1
     NATIVE="<memory>8G</memory> <native>-R 'affinity[core(1)]'</native>"
+    BUILD_WALLTIME="01:00:00"
   fi
   if [[ ${MACHINE_ID} == wcoss_cray ]]; then
     BUILD_CORES=24
     rocoto_cmd="aprun -n 1 -j 1 -N 1 -d $BUILD_CORES $rocoto_cmd"
-    NATIVE="<exclusive></exclusive>"
+    NATIVE="<exclusive></exclusive> <envar><name>PATHTR</name><value>&PATHTR;</value></envar>"
   fi
-  BUILD_WALLTIME="00:30:00"
   if [[ ${MACHINE_ID} == jet ]]; then
     BUILD_WALLTIME="01:00:00"
   fi

diff --git a/tests/tests/fv3_ccpp_control_debug b/tests/tests/fv3_ccpp_control_debug
@@ -6,9 +6,32 @@
 
 export TEST_DESCR="Compare FV3 CCPP control results with previous trunk version"
 
-export CNTL_DIR=fv3_control
+export CNTL_DIR=fv3_control_debug
 
-export LIST_FILES=""
+export LIST_FILES="phyf000.tile1.nc \
+                   phyf000.tile2.nc \
+                   phyf000.tile3.nc \
+                   phyf000.tile4.nc \
+                   phyf000.tile5.nc \
+                   phyf000.tile6.nc \
+                   dynf000.tile1.nc \
+                   dynf000.tile2.nc \
+                   dynf000.tile3.nc \
+                   dynf000.tile4.nc \
+                   dynf000.tile5.nc \
+                   dynf000.tile6.nc \
+                   phyf006.tile1.nc \
+                   phyf006.tile2.nc \
+                   phyf006.tile3.nc \
+                   phyf006.tile4.nc \
+                   phyf006.tile5.nc \
+                   phyf006.tile6.nc \
+                   dynf006.tile1.nc \
+                   dynf006.tile2.nc \
+                   dynf006.tile3.nc \
+                   dynf006.tile4.nc \
+                   dynf006.tile5.nc \
+                   dynf006.tile6.nc"
 
 export_fv3
 

diff --git a/tests/tests/fv3_ccpp_stretched_nest_debug b/tests/tests/fv3_ccpp_stretched_nest_debug
@@ -6,8 +6,22 @@
 
 export TEST_DESCR="Compare FV3 CCPP control results with previous trunk version"
 
-export CNTL_DIR=fv3_stretched_nest
-export LIST_FILES=
+export CNTL_DIR=fv3_stretched_nest_debug
+
+export LIST_FILES="fv3_history2d.nest02.tile7.nc \
+                   fv3_history2d.tile1.nc \
+                   fv3_history2d.tile2.nc \
+                   fv3_history2d.tile3.nc \
+                   fv3_history2d.tile4.nc \
+                   fv3_history2d.tile5.nc \
+                   fv3_history2d.tile6.nc \
+                   fv3_history.nest02.tile7.nc \
+                   fv3_history.tile1.nc \
+                   fv3_history.tile2.nc \
+                   fv3_history.tile3.nc \
+                   fv3_history.tile4.nc \
+                   fv3_history.tile5.nc \
+                   fv3_history.tile6.nc"
 
 export_fv3