Skip to content

Commit

Permalink
- Update version and copyright. (#691)
Browse files Browse the repository at this point in the history
- Remove gordon and conrad machines.
- Add setenv OMP_STACKSIZE commented out in env files
- Update Icepack to fc4b809
  • Loading branch information
apcraig authored Feb 23, 2022
1 parent a59fa47 commit 8c23df8
Show file tree
Hide file tree
Showing 50 changed files with 83 additions and 960 deletions.
4 changes: 2 additions & 2 deletions cicecore/drivers/direct/hadgem3/CICE.F90
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/mct/cesm1/CICE_copyright.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/nuopc/cmeps/CICE_copyright.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/nuopc/dmi/CICE.F90
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/standalone/cice/CICE.F90
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cicecore/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CICE 6.3.0
CICE 6.3.1
2 changes: 1 addition & 1 deletion configuration/scripts/cice.batch.csh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
6 changes: 0 additions & 6 deletions configuration/scripts/cice.launch.csh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
57 changes: 0 additions & 57 deletions configuration/scripts/machines/Macros.conrad_cray

This file was deleted.

55 changes: 0 additions & 55 deletions configuration/scripts/machines/Macros.conrad_gnu

This file was deleted.

56 changes: 0 additions & 56 deletions configuration/scripts/machines/Macros.conrad_intel

This file was deleted.

55 changes: 0 additions & 55 deletions configuration/scripts/machines/Macros.conrad_pgi

This file was deleted.

57 changes: 0 additions & 57 deletions configuration/scripts/machines/Macros.gordon_cray

This file was deleted.

Loading

0 comments on commit 8c23df8

Please sign in to comment.