Merge remote-tracking branch 'upstream/emc/develop' into HEAD

DeniseWorthen · Jul 17, 2020 · 86b8dab · 86b8dab
2 parents 9bdb9ad + 8f37bfc
commit 86b8dab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/configuration/scripts/forapps/ufs/comp_ice.backend.clean b/configuration/scripts/forapps/ufs/comp_ice.backend.clean
@@ -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

diff --git a/configuration/scripts/forapps/ufs/comp_ice.backend.libcice b/configuration/scripts/forapps/ufs/comp_ice.backend.libcice
@@ -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