Skip to content

Commit 8c23df8

Browse files
apcraigapcraig
authored
- Update version and copyright. (#691)
- Remove gordon and conrad machines. - Add setenv OMP_STACKSIZE commented out in env files - Update Icepack to fc4b809
1 parent a59fa47 commit 8c23df8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+83
-960
lines changed

‎cicecore/drivers/direct/hadgem3/CICE.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
!=======================================================================
2-
! Copyright (c) 2021, Triad National Security, LLC
2+
! Copyright (c) 2022, Triad National Security, LLC
33
! All rights reserved.
44
!
5-
! Copyright 2021. Triad National Security, LLC. This software was
5+
! Copyright 2022. Triad National Security, LLC. This software was
66
! produced under U.S. Government contract DE-AC52-06NA25396 for Los
77
! Alamos National Laboratory (LANL), which is operated by Triad
88
! National Security, LLC for the U.S. Department of Energy. The U.S.

‎cicecore/drivers/mct/cesm1/CICE_copyright.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
! Copyright (c) 2021, Triad National Security, LLC
1+
! Copyright (c) 2022, Triad National Security, LLC
22
! All rights reserved.
33
!
4-
! Copyright 2021. Triad National Security, LLC. This software was
4+
! Copyright 2022. Triad National Security, LLC. This software was
55
! produced under U.S. Government contract DE-AC52-06NA25396 for Los
66
! Alamos National Laboratory (LANL), which is operated by Triad
77
! National Security, LLC for the U.S. Department of Energy. The U.S.

‎cicecore/drivers/nuopc/cmeps/CICE_copyright.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
! Copyright (c) 2021, Triad National Security, LLC
1+
! Copyright (c) 2022, Triad National Security, LLC
22
! All rights reserved.
33
!
4-
! Copyright 2021. Triad National Security, LLC. This software was
4+
! Copyright 2022. Triad National Security, LLC. This software was
55
! produced under U.S. Government contract DE-AC52-06NA25396 for Los
66
! Alamos National Laboratory (LANL), which is operated by Triad
77
! National Security, LLC for the U.S. Department of Energy. The U.S.

‎cicecore/drivers/nuopc/dmi/CICE.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
!=======================================================================
2-
! Copyright (c) 2021, Triad National Security, LLC
2+
! Copyright (c) 2022, Triad National Security, LLC
33
! All rights reserved.
44
!
5-
! Copyright 2021. Triad National Security, LLC. This software was
5+
! Copyright 2022. Triad National Security, LLC. This software was
66
! produced under U.S. Government contract DE-AC52-06NA25396 for Los
77
! Alamos National Laboratory (LANL), which is operated by Triad
88
! National Security, LLC for the U.S. Department of Energy. The U.S.

‎cicecore/drivers/standalone/cice/CICE.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
!=======================================================================
2-
! Copyright (c) 2021, Triad National Security, LLC
2+
! Copyright (c) 2022, Triad National Security, LLC
33
! All rights reserved.
44
!
5-
! Copyright 2021. Triad National Security, LLC. This software was
5+
! Copyright 2022. Triad National Security, LLC. This software was
66
! produced under U.S. Government contract DE-AC52-06NA25396 for Los
77
! Alamos National Laboratory (LANL), which is operated by Triad
88
! National Security, LLC for the U.S. Department of Energy. The U.S.

‎cicecore/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CICE 6.3.0
1+
CICE 6.3.1

‎configuration/scripts/cice.batch.csh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ cat >> ${jobfile} << EOFB
9191
#PBS -l walltime=${batchtime}
9292
EOFB
9393

94-
else if (${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad* || ${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr* || ${ICE_MACHINE} =~ mustang*) then
94+
else if (${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr* || ${ICE_MACHINE} =~ mustang*) then
9595
cat >> ${jobfile} << EOFB
9696
#PBS -N ${shortcase}
9797
#PBS -q ${queue}

‎configuration/scripts/cice.launch.csh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ cat >> ${jobfile} << EOFR
6363
aprun -n ${ntasks} -N ${taskpernodelimit} -d ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE
6464
EOFR
6565

66-
#=======
67-
else if (${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad*) then
68-
cat >> ${jobfile} << EOFR
69-
aprun -n ${ntasks} -N ${taskpernodelimit} -d ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE
70-
EOFR
71-
7266
#=======
7367
else if (${ICE_MACHINE} =~ cori*) then
7468
if (${ICE_COMMDIR} =~ serial*) then

‎configuration/scripts/machines/Macros.conrad_cray‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎configuration/scripts/machines/Macros.conrad_gnu‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)