LANL machine files: add badger, remove wolf, pinto

configuration/driver/icedrv_init_column.F90

@@ -600,7 +600,8 @@ subroutine init_zbgc
          nt_bgc_Fep         !  particulate iron
 
       integer (kind=int_kind), dimension(icepack_max_aero) :: &
-         nt_zaero           !  black carbon and other aerosols
+         nt_zaero       , & !  black carbon and other aerosols
+         nt_zaero_sw        !  for shortwave calculation
 
       integer (kind=int_kind), dimension(icepack_max_nbtrcr) :: &
          bio_index_o        ! relates nlt_bgc_NO to ocean concentration index
@@ -1272,6 +1273,7 @@ subroutine init_zbgc
       nlt_zaero(:) = 0
       nlt_zaero_sw(:) = 0
       nt_zaero(:) = 0
+      nt_zaero_sw(:) = 0
 
       nlt_bgc_Nit    = 0
       nlt_bgc_Am     = 0

configuration/scripts/icepack.batch.csh

@@ -98,7 +98,7 @@ cat >> ${jobfile} << EOFB
 ###SBATCH --mail-user username@domain.com
 EOFB
 
-else if (${ICE_MACHINE} =~ wolf*) then
+else if (${ICE_MACHINE} =~ badger*) then
 cat >> ${jobfile} << EOFB
 #SBATCH -J ${ICE_CASENAME}
 #SBATCH -t ${ICE_RUNLENGTH}
@@ -111,19 +111,6 @@ cat >> ${jobfile} << EOFB
 #SBATCH --qos=standby
 EOFB
 
-else if (${ICE_MACHINE} =~ pinto*) then
-cat >> ${jobfile} << EOFB
-#SBATCH -J ${ICE_CASENAME}
-#SBATCH -t ${ICE_RUNLENGTH}
-#SBATCH -A ${acct}
-#SBATCH -N ${nnodes}
-#SBATCH -e slurm%j.err
-#SBATCH -o slurm%j.out
-###SBATCH --mail-type END,FAIL
-###SBATCH --mail-user=eclare@lanl.gov
-#SBATCH --qos=standard
-EOFB
-
 else if (${ICE_MACHINE} =~ loft*) then
 cat >> ${jobfile} << EOFB
 # nothing to do

configuration/scripts/machines/Macros.pinto_intel → configuration/scripts/machines/Macros.badger_intel

@@ -1,5 +1,5 @@
 #==============================================================================
-# Macros file for LANL pinto, intel compiler
+# Macros file for LANL badger, intel compiler
 #==============================================================================
 
 CPP        := fpp
@@ -14,7 +14,8 @@ FFLAGS_NOOPT:= -O0
 ifeq ($(ICE_BLDDEBUG), true)
   FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created
 else
-  FFLAGS     += -O2
+#  FFLAGS     += -O2
+  FFLAGS     += -O1
 endif
 
 ifeq ($(ICE_COMMDIR), mpi)

configuration/scripts/machines/env.wolf_intel → configuration/scripts/machines/env.badger_intel

@@ -1,6 +1,6 @@
 #!/bin/tcsh -f
 
-source /usr/share/Modules/init/csh
+#source /usr/share/Modules/init/csh
 
 #module purge
 #module load intel
@@ -17,15 +17,15 @@ setenv PNETCDF_PATH /usr/projects/climate/SHARED_CLIMATE/software/conejo/paralle
 #setenv MP_EUILIB us
 #setenv MP_EAGER_LIMIT 0
 
-setenv ICE_MACHINE_ENVNAME wolf
+setenv ICE_MACHINE_ENVNAME badger
 setenv ICE_MACHINE_COMPILER intel
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /net/scratch3/$user/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /usr/projects/climate/eclare/DATA/Consortium
 setenv ICE_MACHINE_BASELINE /net/scratch3/$user/ICEPACK_BASELINE
 setenv ICE_MACHINE_SUBMIT "sbatch "
-setenv ICE_MACHINE_ACCT climateacme
+setenv ICE_MACHINE_ACCT e3sm
 setenv ICE_MACHINE_QUEUE "default"
-setenv ICE_MACHINE_TPNODE 16
+setenv ICE_MACHINE_TPNODE 36
 setenv ICE_MACHINE_BLDTHRDS 1
 setenv ICE_MACHINE_QSTAT "squeue --jobs="