Merge branch 'master' into HAFS

ufs-community · Mar 29, 2019 · c13c881 · c13c881
2 parents 68268e0 + 12fadbd
commit c13c881
Show file tree

Hide file tree

Showing 48 changed files with 18,028 additions and 18,217 deletions.
diff --git a/FV3 b/FV3
diff --git a/compsets/gaea.input b/compsets/gaea.input
@@ -6,8 +6,8 @@ gaea.common= {
     MACHINE_ID='gaea'
     HOMEnems=PWD_UP5
     HOMErt=OUTPUT_PATH
-    BASELINE="/lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/trunk-20190225"
-    BASELINE_TEMPLATE="/lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/trunk-20190225"
+    BASELINE="/lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
+    BASELINE_TEMPLATE="/lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
     INPUTS="@[BASELINE]"
 
     SHORT_TEST_QUEUE='&SHORTQ;'

diff --git a/compsets/jet.input b/compsets/jet.input
@@ -78,8 +78,8 @@ platform xjet {
     cores_per_node=24
     cpus_per_core=2
 
-    BASELINE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227-xjet"
-    BASELINE_TEMPLATE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227-xjet"
+    BASELINE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315-xjet"
+    BASELINE_TEMPLATE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315-xjet"
 
     default_resources={
         TASKS=150
@@ -122,8 +122,8 @@ platform svjet {
     cpus_per_core=2
     PARTITION='sjet:vjet'
 
-    BASELINE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227-svjet"
-    BASELINE_TEMPLATE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227-svjet"
+    BASELINE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315-svjet"
+    BASELINE_TEMPLATE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315-svjet"
 
     default_resources={
         TASKS=150
@@ -165,8 +165,8 @@ platform tujet {
     cpus_per_core=2
     PARTITION='ujet:tjet'
 
-    BASELINE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227-tujet"
-    BASELINE_TEMPLATE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227-tujet"
+    BASELINE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315-tujet"
+    BASELINE_TEMPLATE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315-tujet"
 
     default_resources={
         TASKS=150
@@ -210,8 +210,8 @@ platform ujet.slurm {
     execution_time_modules="module load slurm/default"
     MPI='srun'
 
-    BASELINE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227-tujet"
-    BASELINE_TEMPLATE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227-tujet"
+    BASELINE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315-tujet"
+    BASELINE_TEMPLATE="/lfs3/projects/hfv3gfs/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315-tujet"
 
     embed bash detect [[[
         if ( ! which sbatch > /dev/null 2>&1 ) ; then

diff --git a/compsets/theia.input b/compsets/theia.input
@@ -26,8 +26,8 @@ platform theia.intel {   # Moab+Torque Theia.  See below for SLURM.
     # INPUTS is the input directory, which should contain fix and parm
     # files, plus any restarts or other inputs.
 
-    BASELINE="/scratch4/NCEPDEV/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
-    BASELINE_TEMPLATE="/scratch4/NCEPDEV/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
+    BASELINE="/scratch4/NCEPDEV/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
+    BASELINE_TEMPLATE="/scratch4/NCEPDEV/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
     INPUTS="@[BASELINE]"
 
     default_resources={
@@ -127,8 +127,8 @@ platform theia.slurm.intel {   # SLURM support
     # INPUTS is the input directory, which should contain fix and parm
     # files, plus any restarts or other inputs.
 
-    BASELINE="/scratch4/NCEPDEV/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
-    BASELINE_TEMPLATE="/scratch4/NCEPDEV/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
+    BASELINE="/scratch4/NCEPDEV/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
+    BASELINE_TEMPLATE="/scratch4/NCEPDEV/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
     INPUTS="@[BASELINE]"
 
     default_resources={

diff --git a/compsets/wcoss.input b/compsets/wcoss.input
@@ -26,8 +26,8 @@ platform wcoss.phase2 {
     LONG_TEST_QUEUE='&LONGQ;'
     BUILD_QUEUE='&BUILDQ;'
     MACHINE_ID='wcoss.phase2'
-    BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
-    BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
+    BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
+    BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
 
     default_resources={
         TASKS=156
@@ -118,8 +118,8 @@ platform wcoss.phase1 {
     cores_per_node=16
     cpus_per_core=2
     MACHINE_ID='wcoss.phase1'
-    BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
-    BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
+    BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
+    BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
 
     # WCOSS Phase 2 has been slow of late.
     DEFAULT_TEST_WALLTIME=2700
@@ -200,8 +200,8 @@ platform wcoss_dell_p3 {
     LONG_TEST_QUEUE='&LONGQ;'
     BUILD_QUEUE='&BUILDQ;'
 
-    BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
-    BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
+    BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
+    BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
 
     default_resources={
         TASKS=156
@@ -295,8 +295,8 @@ platform wcoss.cray {
     BUILD_WALLTIME="1800"
     DEFAULT_TEST_WALLTIME=1800
 
-    BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
-    BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190227"
+    BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
+    BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190315"
 
     execution_time_modules=[[[
       module load alps