- Update version and copyright. (CICE-Consortium#691)

- Remove gordon and conrad machines. - Add setenv OMP_STACKSIZE commented out in env files - Update Icepack to fc4b809
DeniseWorthen · Feb 23, 2022 · 8c23df8 · 8c23df8
1 parent a59fa47
commit 8c23df8
Show file tree

Hide file tree

Showing 50 changed files with 83 additions and 960 deletions.
diff --git a/cicecore/drivers/direct/hadgem3/CICE.F90 b/cicecore/drivers/direct/hadgem3/CICE.F90
@@ -1,8 +1,8 @@
 !=======================================================================
-! Copyright (c) 2021, Triad National Security, LLC
+! Copyright (c) 2022, Triad National Security, LLC
 ! All rights reserved.
 !                
-! Copyright 2021. Triad National Security, LLC. This software was
+! Copyright 2022. Triad National Security, LLC. This software was
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  

diff --git a/cicecore/drivers/mct/cesm1/CICE_copyright.txt b/cicecore/drivers/mct/cesm1/CICE_copyright.txt
@@ -1,7 +1,7 @@
-! Copyright (c) 2021, Triad National Security, LLC
+! Copyright (c) 2022, Triad National Security, LLC
 ! All rights reserved.
 !                
-! Copyright 2021. Triad National Security, LLC. This software was
+! Copyright 2022. Triad National Security, LLC. This software was
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  

diff --git a/cicecore/drivers/nuopc/cmeps/CICE_copyright.txt b/cicecore/drivers/nuopc/cmeps/CICE_copyright.txt
@@ -1,7 +1,7 @@
-! Copyright (c) 2021, Triad National Security, LLC
+! Copyright (c) 2022, Triad National Security, LLC
 ! All rights reserved.
 !                
-! Copyright 2021. Triad National Security, LLC. This software was
+! Copyright 2022. Triad National Security, LLC. This software was
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  

diff --git a/cicecore/drivers/nuopc/dmi/CICE.F90 b/cicecore/drivers/nuopc/dmi/CICE.F90
@@ -1,8 +1,8 @@
 !=======================================================================
-! Copyright (c) 2021, Triad National Security, LLC
+! Copyright (c) 2022, Triad National Security, LLC
 ! All rights reserved.
 !                
-! Copyright 2021. Triad National Security, LLC. This software was
+! Copyright 2022. Triad National Security, LLC. This software was
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  

diff --git a/cicecore/drivers/standalone/cice/CICE.F90 b/cicecore/drivers/standalone/cice/CICE.F90
@@ -1,8 +1,8 @@
 !=======================================================================
-! Copyright (c) 2021, Triad National Security, LLC
+! Copyright (c) 2022, Triad National Security, LLC
 ! All rights reserved.
 !                
-! Copyright 2021. Triad National Security, LLC. This software was
+! Copyright 2022. Triad National Security, LLC. This software was
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  

diff --git a/cicecore/version.txt b/cicecore/version.txt
@@ -1 +1 @@
-CICE 6.3.0
+CICE 6.3.1
diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh
@@ -91,7 +91,7 @@ cat >> ${jobfile} << EOFB
 #PBS -l walltime=${batchtime}
 EOFB
 
-else if (${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad*  || ${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr* || ${ICE_MACHINE} =~ mustang*) then
+else if (${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr* || ${ICE_MACHINE} =~ mustang*) then
 cat >> ${jobfile} << EOFB
 #PBS -N ${shortcase}
 #PBS -q ${queue}

diff --git a/configuration/scripts/cice.launch.csh b/configuration/scripts/cice.launch.csh
@@ -63,12 +63,6 @@ cat >> ${jobfile} << EOFR
 aprun -n ${ntasks} -N ${taskpernodelimit} -d ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE
 EOFR
 
-#=======
-else if (${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad*) then
-cat >> ${jobfile} << EOFR
-aprun -n ${ntasks} -N ${taskpernodelimit} -d ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE
-EOFR
-
 #=======
 else if (${ICE_MACHINE} =~ cori*) then
 if (${ICE_COMMDIR} =~ serial*) then

diff --git a/configuration/scripts/machines/Macros.conrad_cray b/configuration/scripts/machines/Macros.conrad_cray
diff --git a/configuration/scripts/machines/Macros.conrad_gnu b/configuration/scripts/machines/Macros.conrad_gnu
diff --git a/configuration/scripts/machines/Macros.conrad_intel b/configuration/scripts/machines/Macros.conrad_intel
diff --git a/configuration/scripts/machines/Macros.conrad_pgi b/configuration/scripts/machines/Macros.conrad_pgi
diff --git a/configuration/scripts/machines/Macros.gordon_cray b/configuration/scripts/machines/Macros.gordon_cray