This commit #refs 67538, squashed commit of the following:

commit c9d7d00
Merge: 57d5044 02f3319
Author: Dom Heinzeller <[email protected]>
Date:   Sun Sep 8 20:32:11 2019 -0600

    Merge pull request NCAR#8 from climbfuji/gmtb_develop_monster_merge_20190904

    Merge gsd/develop, restore GNU portability

commit 02f3319
Merge: abe9efb d1be445
Author: Dom Heinzeller <[email protected]>
Date:   Wed Sep 4 09:04:52 2019 -0600

    Merge branch 'gsd/develop' of https://github.com/NCAR/NEMS into gmtb_develop_update_from_master_20190830

commit abe9efb
Author: Dom Heinzeller <[email protected]>
Date:   Tue Sep 3 16:25:12 2019 -0600

    src/module_MEDIATOR.F90: fix invalid Fortran code for GNU compiler

commit 57d5044
Merge: 71a4c82 2327dae
Author: Dom Heinzeller <[email protected]>
Date:   Tue Sep 3 09:20:02 2019 -0600

    Merge pull request NCAR#7 from climbfuji/gmtb_develop_update_from_master_20190830

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

commit 2327dae
Author: Ratko Vasic <[email protected]>
Date:   Fri Aug 30 19:16:52 2019 +0000

    Posrt 2 hera

commit e638b7e
Author: Raffaele Montuoro <[email protected]>
Date:   Thu Aug 22 20:42:22 2019 +0000

    Add standard name to NUOPC Field Dictionary
    defining instantaneous specific humidity
    tendency due to convection.

commit c3ec2c4
Author: Gerhard Theurich <[email protected]>
Date:   Wed Aug 21 23:26:44 2019 +0000

    Support the official NUOPC Verbosity strings "off", "low", "high", "max" for compliance.

commit 71a4c82
Merge: fd81084 89ddf13
Author: Dom Heinzeller <[email protected]>
Date:   Fri Aug 30 07:39:05 2019 -0600

    Merge pull request NCAR#3 from climbfuji/bugfix_nemscompsetrun

    Bugfix for NemsCompset detection of Theia/Hera

commit fd81084
Merge: 283eeb1 053bd17
Author: Dom Heinzeller <[email protected]>
Date:   Thu Aug 29 15:35:33 2019 -0600

    Merge pull request NCAR#4 from grantfirl/gmtb/develop

    add Julie as codeowner

commit 053bd17
Author: Grant Firl <[email protected]>
Date:   Thu Aug 29 15:26:22 2019 -0600

    add Julie as codeowner

commit 89ddf13
Author: Dom Heinzeller <[email protected]>
Date:   Wed Aug 28 13:36:52 2019 -0600

    src/incmake/env/rdhpcs/detect.mk: bugfix for NEMSCompsetRun

commit 283eeb1
Merge: 1c71222 e142f4e
Author: Dom Heinzeller <[email protected]>
Date:   Tue Aug 27 15:45:57 2019 -0600

    Merge pull request NCAR#2 from climbfuji/hera_update_20190827

    gmtb/develop: update hera config

commit e142f4e
Author: Dom Heinzeller <[email protected]>
Date:   Tue Aug 27 15:04:16 2019 -0600

    src/incmake/env/rdhpcs/detect.mk: test for hostname prefix, since hera and theia both have /scratch1 through /scratch4 mounted

commit 028e1e8
Author: Dom Heinzeller <[email protected]>
Date:   Tue Aug 27 13:45:29 2019 -0600

    Update src/incmake/env/rdhpcs/detect.mk, src/conf/module-setup.csh.inc, src/conf/module-setup.sh.inc after move from Juno test system to Hera. Since /scratch4 from theia is also mounted on hera, need to switch the order of detection.

commit 1c71222
Merge: 6bf8109 5b244ab
Author: Dom Heinzeller <[email protected]>
Date:   Sat Aug 17 16:25:57 2019 -0600

    Merge pull request NCAR#1 from climbfuji/hera_support

    Add support for hera/juno (theia successor)

commit 5b244ab
Author: Dom Heinzeller <[email protected]>
Date:   Fri Aug 16 09:33:34 2019 -0600

    Add support for hera/juno (theia successor)

commit d1be445
Author: Laurie Carson <[email protected]>
Date:   Fri Aug 16 09:01:15 2019 -0600

    Add CODEOWNERS for NCAR fork of NEMS repository

commit 766e0cd
Author: Laurie Carson <[email protected]>
Date:   Fri Aug 16 09:00:10 2019 -0600

    Add CODEOWNERS for NCAR fork of NEMS repository

commit 6bf8109
Author: Laurie Carson <[email protected]>
Date:   Fri Aug 16 08:59:16 2019 -0600

    Add CODEOWNERS for NCAR fork of NEMS repository

src/conf/module-setup.csh.inc

@@ -8,7 +8,13 @@ if ( { test -d /lfs3 } ) then
             source /apps/lmod/lmod/init/$__ms_shell
     endif
     module purge
-else if ( { test -d /scratch3 } ) then
+else if ( { test -d /scratch1 -a ! -d /scratch } ) then
+    # We are on NOAA Hera
+    if ( ! { module help >& /dev/null } ) then
+        source /apps/lmod/lmod/init/$__ms_shell
+    endif
+    module purge
+else if ( { test -d /scratch3 -a -d /scratch } ) then
     # We are on NOAA Theia
     if ( ! { module help >& /dev/null } ) then
         source /apps/lmod/lmod/init/$__ms_shell

src/conf/module-setup.sh.inc

@@ -22,7 +22,13 @@ if [[ -d /lfs3 ]] ; then
         source /apps/lmod/lmod/init/$__ms_shell
     fi
     module purge
-elif [[ -d /scratch3 ]] ; then
+elif [[ -d /scratch1 && ! -d /scratch ]] ; then
+    # We are on NOAA Hera
+    if ( ! eval module help > /dev/null 2>&1 ) ; then
+        source /apps/lmod/lmod/init/$__ms_shell
+    fi
+    module purge
+elif [[ -d /scratch3 && -d /scratch ]] ; then
     # We are on NOAA Theia
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         source /apps/lmod/lmod/init/$__ms_shell

src/module_MEDIATOR.F90

@@ -922,7 +922,7 @@ 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=(/"off","low","high","max"/), &
+      specialStringList=(/character(4)::"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