Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/emc/develop' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
DeniseWorthen committed Jul 17, 2020
2 parents 9bdb9ad + 8f37bfc commit 86b8dab
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
8 changes: 4 additions & 4 deletions configuration/scripts/forapps/ufs/comp_ice.backend.clean
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ setenv OBJDIR $EXEDIR/compile ; if !(-d $OBJDIR) mkdir -p $OBJDIR

if (${SITE} =~ cheyenne*) then
setenv ARCH cheyenne_intel
#else if (${SITE} =~ Orion*) then
# setenv ARCH orion_intel
#else if (${SITE} =~ hera*) then
# setenv ARCH hera_intel
else if (${SITE} =~ orion*) then
setenv ARCH orion_intel
else if (${SITE} =~ hera*) then
setenv ARCH hera_intel
else
echo "CICE6 ${0}: ERROR in ARCH setup, ${hname}"
exit -2
Expand Down
6 changes: 4 additions & 2 deletions configuration/scripts/forapps/ufs/comp_ice.backend.libcice
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,11 @@ endif
# Build in debug mode. If DEBUG=Y, enable DEBUG compilation. This
# flag is set in ${ROOTDIR}/coupledFV3_MOM6_CICE_debug.appBuilder file.
if (! $?DEBUG) then
setenv ICE_BLDDEBUG true
setenv ICE_BLDDEBUG false
else
if ($DEBUG != "Y") then
if ($DEBUG == "Y") then
setenv ICE_BLDDEBUG true
else
setenv ICE_BLDDEBUG false
endif
endif
Expand Down

0 comments on commit 86b8dab

Please sign in to comment.