Merge pull request NCAR#7 from climbfuji/gmtb_develop_update_from_mas…

…ter_20190830

gmtb/develop: update from master 2019/08/30

src/incmake/env/rdhpcs/detect.mk

@@ -4,13 +4,13 @@
 #
 ########################################################################
 
-ifneq (,$(and $(wildcard /scratch1),$(and $(wildcard /scratch2),$(wildcard /xcatpost))))
+ifneq (,$(and $(wildcard /scratch),$(wildcard /scratch3)))
   NEMS_COMPILER?=intel
-  $(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(NEMS_COMPILER).mk)
+  $(call add_build_env,theia.$(NEMS_COMPILER),env/rdhpcs/theia.$(NEMS_COMPILER).mk)
 else
-  ifneq (,$(and $(wildcard /scratch4),$(and $(wildcard /scratch3),$(wildcard /tftpboot))))
+  ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2)))
     NEMS_COMPILER?=intel
-    $(call add_build_env,theia.$(NEMS_COMPILER),env/rdhpcs/theia.$(NEMS_COMPILER).mk)
+    $(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(NEMS_COMPILER).mk)
   else
     ifneq (,$(and $(wildcard /lfs1),$(wildcard /lfs3)))
       NEMS_COMPILER?=intel

src/module_EARTH_GRID_COMP.F90

@@ -3017,6 +3017,18 @@ SUBROUTINE EARTH_REGISTER(EARTH_GRID_COMP,RC_REG)
           return  ! bail out
       endif
 
+      if (.not.NUOPC_FieldDictionaryHasEntry( &
+        "inst_spec_humid_conv_tendency_levels")) then
+        call NUOPC_FieldDictionaryAddEntry( &
+          standardName="inst_spec_humid_conv_tendency_levels", &
+          canonicalUnits="kg kg-1 s-1", &
+          rc=rc)
+        if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
+          line=__LINE__, &
+          file=__FILE__)) &
+          return  ! bail out
+      endif
+
       if (.not.NUOPC_FieldDictionaryHasEntry( &
         "inst_friction_velocity")) then
         call NUOPC_FieldDictionaryAddEntry( &

src/module_MEDIATOR.F90

@@ -922,7 +922,8 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
       line=__LINE__, file=__FILE__)) return  ! bail out
     dbug_flag = ESMF_UtilString2Int(value, &
-      specialStringList=(/"min","max"/), specialValueList=(/0,255/), rc=rc)
+      specialStringList=(/"off","low","high","max"/), &
+      specialValueList=(/0,1,100,255/), rc=rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
       line=__LINE__, file=__FILE__)) return  ! bail out
     write(msgString,'(A,i6)') trim(subname)//' dbug_flag = ',dbug_flag

tests/commit.def

@@ -1,28 +1,28 @@
 # Directory to receive the webpage with regression test results
-#ON tujet          WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-#ON ujet.slurm     WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON theia          WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-#ON theia.intel    WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON theia.slurm.intel  WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON wcoss1         WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON wcoss2         WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON wcoss_cray     WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON wcoss_dell_p3  WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-#ON gaea           WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
+#ON tujet          WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+#ON ujet.slurm     WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON theia          WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+#ON theia.intel    WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON theia.slurm.intel  WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON wcoss1         WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON wcoss2         WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON wcoss_cray     WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON wcoss_dell_p3  WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+#ON gaea           WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
 
 USER ACCOUNT IS Ratko.Vasic
 ROLE ACCOUNT IS emc.nemspara
 
 # nems branch - branch of NEMS that is being tested.  Set to "default"
 # to test the app's own NEMS
-NEMS   BRANCH IS combogsdww3nems
+NEMS   BRANCH IS commit_tmp
 
 # app branch - branch to use for committing logs to each 
-APP    BRANCH IS combo-commit
+#APP    BRANCH IS NUOPC-commit
 
 # If relevant, the starting branch that we copy to make the app
 # branch.  Default is the master branch.
-#APP NEMSfv3gfs       CHECKOUT combo
+#APP NEMSfv3gfs       CHECKOUT NUOPC
 
 # master branch - name of the git "master" branch.  Do not change.
 MASTER BRANCH IS master

tests/multi-app-test.sh

@@ -1560,7 +1560,7 @@ push_to_master() {
     done
 
     # Check out $master_branch of NEMS:
-    git clone gerrit:NEMS NEMS
+    git clone github:NEMS NEMS
     cd NEMS
     git checkout "$master_branch"
 

tests/nightly/run-from-wcoss.sh

@@ -13,6 +13,12 @@ if [[ "$hostchar" == "$prodchar" ]] ; then
     exit 1
 fi
 
+#WCOSS_Cray need to load newer git version
+if [[ `hostname | cut -c2-6` == "login" ]] ; then
+    source /opt/modules/default/init/sh
+    module use /usrx/local/dev/modulefiles
+    module load git/2.18.0
+fi
 
 cd $( dirname "$0" )
 cd ..