Merge pull request #13 from DirkOlivie/cime5.6.10_cesm2_1_rel_06-Nor

Activated for CAM on fram/vilje : -init=zero,arrays
NorESMhub · Jul 17, 2020 · 05dca4f · 05dca4f
2 parents 0e0a453 + 06d4d4a
commit 05dca4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/config/cesm/machines/config_compilers.xml b/config/cesm/machines/config_compilers.xml
@@ -1186,6 +1186,7 @@ using a fortran linker.
   <FFLAGS>
     <append DEBUG="FALSE"> -O2 -xAVX </append>
     <append MODEL="blom"> -r8 </append>
+    <append MODEL="cam"> -init=zero,arrays </append>
   </FFLAGS>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
   <SLIBS>
@@ -1207,6 +1208,7 @@ using a fortran linker.
   <FFLAGS>
     <append DEBUG="FALSE"> -O2 </append>
     <append MODEL="blom"> -r8 </append>
+    <append MODEL="cam"> -init=zero,arrays </append>
   </FFLAGS>
   <MPICC> mpiicc </MPICC>
   <MPICXX> mpiicpc </MPICXX>

diff --git a/scripts/lib/CIME/case/case.py b/scripts/lib/CIME/case/case.py
@@ -875,7 +875,7 @@ def configure(self, compset_name, grid_name, machine_name=None,
 
         if not test and not run_unsupported and self._cime_model == "cesm":
             if grid_name in science_support:
-                logger.info("\nThis is a CESM scientifically supported compset at this resolution.\n")
+                logger.info("\nThis is a CESM or NorESM scientifically supported compset at this resolution.\n")
             else:
                 self._check_testlists(compset_alias, grid_name, files)