Merge pull request #934 from cacraigucar/cam_derecho_cesm2_1

cam_cesm2_1_rel_60: Fix derecho tests on cesm2_1 branch
ESCOMP · Dec 12, 2023 · a03b84b · a03b84b
2 parents 43488d4 + 18ca8a4
commit a03b84b
Show file tree

Hide file tree

Showing 8 changed files with 1,107 additions and 668 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -9,22 +9,22 @@ required = True
 local_path = components/cice
 
 [cime]
-tag = cime5.6.33
+tag = cime5.6.47
 protocol = git
 repo_url = https://github.com/ESMCI/cime
 required = True
 local_path = cime
 
 [cism]
-tag = release-cesm2.0.04
+tag = cism-release-cesm2.1.2_03
 protocol = git
 repo_url = https://github.com/ESCOMP/cism-wrapper
 externals = Externals_CISM.cfg
 required = True
 local_path = components/cism
 
 [clm]
-tag = release-clm5.0.27
+tag = release-clm5.0.35
 protocol = git
 repo_url = https://github.com/ESCOMP/ctsm
 externals = Externals_CLM.cfg

diff --git a/bld/Makefile.in b/bld/Makefile.in
@@ -408,7 +408,7 @@ ifeq ($(FC_TYPE),intel)
  CPPDEF += -DCPRINTEL $(NO_CONTIGUOUS_FLAG)
  CFLAGS += -std=gnu99
  FC_FLAGS := -ftz -convert big_endian -fp-model source -no-fma \
- -qno-opt-dynamic-align -assume realloc_lhs -xHost
+ -qno-opt-dynamic-align -assume realloc_lhs
  FC_FLAGS_O3OPT:= $(FC_FLAGS)
  FC_FLAGS_NOOPT:= -ftz -convert big_endian -O0
  FREEFLAGS :=