Skip to content

This commit #refs 67538 (merge gmtb/develop into NOAA-EMC/develop) #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RatkoVasic-NOAA merged 1 commit into from
Sep 9, 2019
Merged

This commit #refs 67538 (merge gmtb/develop into NOAA-EMC/develop) #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/conf/module-setup.csh.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion src/conf/module-setup.sh.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/module_MEDIATOR.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down