-
Notifications
You must be signed in to change notification settings - Fork 132
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updates to advanced snow physics implementation (#852)
* Replace tr_snow flag with snwredist, snwgrain in some places (tr_snow is still used more generally). Fix intent(out) compile issue in ice_read_write.F90. Replace badger with chicoma machine files. * update icepack to 86cae16d1b7c4c4f8 --------- Co-authored-by: apcraig <[email protected]>
- Loading branch information
1 parent
7e8dc5b
commit 8322416
Showing
10 changed files
with
145 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -184,7 +184,7 @@ cat >> ${jobfile} <<EOFB | |
| ###SBATCH --mail-user [email protected] | ||
| EOFB | ||
|
|
||
| else if (${ICE_MACHINE} =~ badger*) then | ||
| else if (${ICE_MACHINE} =~ chicoma*) then | ||
| cat >> ${jobfile} << EOFB | ||
| #SBATCH -J ${ICE_CASENAME} | ||
| #SBATCH -t ${batchtime} | ||
|
|
@@ -194,7 +194,9 @@ cat >> ${jobfile} << EOFB | |
| #SBATCH -o slurm%j.out | ||
| ###SBATCH --mail-type END,FAIL | ||
| ###SBATCH [email protected] | ||
| #SBATCH --qos=standby | ||
| ##SBATCH --qos=debug | ||
| #SBATCH --qos=standard | ||
| ##SBATCH --qos=standby | ||
| EOFB | ||
|
|
||
| else if (${ICE_MACHINE} =~ fram*) then | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| #============================================================================== | ||
| # Macros file for LANL chicoma, intel compiler | ||
| #============================================================================== | ||
|
|
||
| CPP := fpp | ||
| CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS} | ||
| CFLAGS := -c -O2 -fp-model precise -fcommon | ||
|
|
||
| FIXEDFLAGS := -132 | ||
| FREEFLAGS := -FR | ||
| FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback | ||
| # -mcmodel medium -shared-intel | ||
| FFLAGS_NOOPT:= -O0 | ||
|
|
||
| ifeq ($(ICE_BLDDEBUG), true) | ||
| FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created | ||
| # FFLAGS += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -init=snan,arrays | ||
| else | ||
| FFLAGS += -O2 | ||
| endif | ||
|
|
||
| SCC := cc | ||
| SFC := ftn | ||
| MPICC := cc | ||
| MPIFC := ftn | ||
|
|
||
| ifeq ($(ICE_COMMDIR), mpi) | ||
| FC := $(MPIFC) | ||
| CC := $(MPICC) | ||
| else | ||
| FC := $(SFC) | ||
| CC := $(SCC) | ||
| endif | ||
| LD:= $(FC) | ||
|
|
||
| # defined by module | ||
| #NETCDF_PATH := $(NETCDF_DIR) | ||
| NETCDF_PATH := /opt/cray/pe/netcdf-hdf5parallel/4.9.0.1/intel/19.0/ | ||
| #PNETCDF_PATH := $(PNETCDF) | ||
| #PNETCDF_PATH := /glade/apps/opt/pnetcdf/1.3.0/intel/default | ||
| #LAPACK_LIBDIR := /glade/apps/opt/lapack/3.4.2/intel/12.1.5/lib | ||
|
|
||
| #PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs | ||
|
|
||
| #INCLDIR := $(INCLDIR) | ||
| INCLDIR += -I$(NETCDF_PATH)/include | ||
|
|
||
| LIB_NETCDF := $(NETCDF_PATH)/lib | ||
| #LIB_PNETCDF := $(PNETCDF_PATH)/lib | ||
| #LIB_MPI := $(IMPILIBDIR) | ||
| SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff | ||
|
|
||
| ifeq ($(ICE_THREADED), true) | ||
| LDFLAGS += -qopenmp | ||
| CFLAGS += -qopenmp | ||
| FFLAGS += -qopenmp | ||
| endif | ||
|
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| #!/bin/csh -f | ||
|
|
||
| # this works (current defaults with PrgEnv-intel) | ||
| #Currently Loaded Modules: | ||
| # 1) craype-x86-rome 7) python/3.10-anaconda-2023.03 13) cray-mpich/8.1.21 | ||
| # 2) libfabric/1.15.0.0 8) craype/2.7.19 14) totalview/2023.1.6 | ||
| # 3) craype-network-ofi 9) cray-dsmml/0.2.2 15) use.own | ||
| # 4) perftools-base/22.09.0 10) cray-libsci/22.11.1.2 16) idl/8.5 | ||
| # 5) xpmem/2.4.4-2.3_13.8__gff0e1d9.shasta 11) PrgEnv-intel/8.3.3 17) cray-hdf5-parallel/1.12.2.1 | ||
| # 6) git/2.40.0 12) intel/2022.2.1 18) cray-netcdf-hdf5parallel/4.9.0.1 | ||
|
|
||
| set inp = "undefined" | ||
| if ($#argv == 1) then | ||
| set inp = $1 | ||
| endif | ||
|
|
||
| if ("$inp" != "-nomodules") then | ||
|
|
||
| #source /opt/modules/default/init/csh | ||
|
|
||
| #module unload PrgEnv-cray | ||
| #module unload PrgEnv-gnu | ||
| #module unload PrgEnv-intel | ||
| #module unload PrgEnv-pgi | ||
| #module load PrgEnv-intel/8.3.3 | ||
|
|
||
| #module unload intel | ||
| #module load intel/2022.2.1 | ||
|
|
||
| #module unload cray-mpich | ||
| #module unload cray-mpich2 | ||
| #module load cray-mpich/8.1.21 | ||
|
|
||
| #module unload netcdf | ||
| #module unload cray-netcdf | ||
| #module unload cray-hdf5 | ||
| #module unload cray-hdf5-parallel | ||
| #module unload cray-netcdf-hdf5parallel | ||
| #module unload cray-parallel-netcdf | ||
| #module load cray-hdf5/1.12.2.1 | ||
| #module load cray-netcdf/4.9.0.1 | ||
| #module load cray-hdf5-parallel/1.12.2.1 | ||
| #module load cray-netcdf-hdf5parallel/4.9.0.1 | ||
|
|
||
| #module unload cray-libsci | ||
| #module unload craype-hugepages2M | ||
| #module load craype-broadwell | ||
|
|
||
| #setenv NETCDF_PATH ${NETCDF_DIR} | ||
| #setenv NETCDF_PATH /opt/cray/pe/netcdf/4.9.0.1/intel/19.0 | ||
| #setenv NETCDF_PATH /opt/cray/pe/netcdf-hdf5parallel/4.9.0.1/intel/19.0 | ||
| limit coredumpsize unlimited | ||
| limit stacksize unlimited | ||
| setenv OMP_STACKSIZE 64M | ||
|
|
||
| endif | ||
|
|
||
| setenv ICE_MACHINE_MACHNAME chicoma | ||
| setenv ICE_MACHINE_MACHINFO "HPE Cray EX, AMD EPYC 7H12 processors" | ||
| setenv ICE_MACHINE_ENVNAME intel | ||
| setenv ICE_MACHINE_ENVINFO "PrgEnv-intel/8.3.3 intel/2022.2.1 cray-mpich/8.1.21 cray-hdf4-parallel/1/12.2.1 cray-netcdf-hdf5parallel/4.9.0.1" | ||
| setenv ICE_MACHINE_MAKE gmake | ||
| setenv ICE_MACHINE_WKDIR /lustre/scratch5/$user/CICE_RUNS | ||
| setenv ICE_MACHINE_INPUTDATA /usr/projects/climate/eclare/DATA/Consortium | ||
| setenv ICE_MACHINE_BASELINE /lustre/scratch5/$user/CICE_BASELINE | ||
| setenv ICE_MACHINE_SUBMIT "sbatch " | ||
| setenv ICE_MACHINE_ACCT t23_cice | ||
| setenv ICE_MACHINE_QUEUE "debug" | ||
| setenv ICE_MACHINE_TPNODE 128 # tasks per node | ||
| setenv ICE_MACHINE_BLDTHRDS 12 | ||
| setenv ICE_MACHINE_QSTAT "squeue --jobs=" |
Submodule icepack
updated
15 files