Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support/lisf 557ww 7.5 milan #1590

Merged
merged 21 commits into from
Aug 22, 2024
Merged

Support/lisf 557ww 7.5 milan #1590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5d0421e
(1) Added the milan modulefile to support/lisf-557ww-7.5
smahanam Jul 16, 2024
b87e8e7
further modified to improve memory management
smahanam Jul 17, 2024
b17542f
increased wall times
smahanam Jul 17, 2024
fd7a245
increased walltime for few other jobs for milan
smahanam Jul 17, 2024
5a534a3
some minor modifications
smahanam Jul 18, 2024
fa76145
bcsd01 now 4 jobs
smahanam Jul 18, 2024
3aeb107
cas/sky needed an extra job
smahanam Jul 18, 2024
cee02b8
added packable and using srun
smahanam Jul 22, 2024
fb6126f
updates for job grouping
smahanam Jul 24, 2024
687619c
fixed a bug that I had entered this afternoon in the previous chjeck in
smahanam Jul 25, 2024
51f3e70
riverted some of the changes I made this afternoon
smahanam Jul 25, 2024
a12ecc0
a bug fix to the previous check in
smahanam Jul 25, 2024
100fce9
a typo was fixed in s2splots
smahanam Jul 25, 2024
2135b10
updated print_walltime to update to deal with multiple start, end, el…
smahanam Jul 26, 2024
bd9d006
changed to check if CONSTRAINT contains mil
smahanam Jul 26, 2024
e19b973
1) deleted a few blank lines and unnecessary /bin/rm lines in s2s_run.sh
smahanam Aug 12, 2024
7cf37e4
Kristi's modifications pertaining to HPC-11
smahanam Aug 12, 2024
e54c885
added mono_YOB color pallete
smahanam Aug 12, 2024
ba2934d
fixed a bug in Mollewide, added two new scripts to compute/plot weekl…
smahanam Aug 13, 2024
5fe59b2
added polar steorographic projection
smahanam Aug 13, 2024
0aaf002
a bug fix in polar stereographic plotting
smahanam Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion env/discover/lisf_7.5_intel_2021.4.0_s2s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,7 @@ prepend-path LD_LIBRARY_PATH "$def_lis_petsc/lib"
prepend-path PATH "$def_lis_netcdf/bin:$def_lis_eccodes/bin"

# EMK Miniconda3 environment for S2S
prepend-path PATH "/discover/nobackup/projects/usaf_lis/emkemp/miniconda3/20221027/bin"
prepend-path PATH "/discover/nobackup/projects/usaf_lis/emkemp/miniconda3/20240712_py311_sles15_hpc11/bin"
setenv ESMFMKFILE /discover/nobackup/projects/usaf_lis/emkemp/miniconda3/20240712_py311_sles15_hpc11/lib/esmf.mk
setenv PROJ_LIB /discover/nobackup/projects/usaf_lis/emkemp/miniconda3/20240712_py311_sles15_hpc11/share/proj/

168 changes: 168 additions & 0 deletions env/discover/lisf_7.5_intel_2023.2.1_s2s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
#%Module1.0###################################################################

proc ModulesHelp { } {
puts stderr "\t[module-info name] - loads the LISF_7_5_INTEL_2023_2_1 env"
puts stderr ""
puts stderr "This is for use on NCCS' discover system running SLES 15.4."
puts stderr ""
puts stderr "\tThe following env variables are set:"
puts stderr "\t\tDEV_ENV"
puts stderr "\t\tLIS_ARCH"
puts stderr "\t\tLIS_SPMD"
puts stderr "\t\tLIS_FC"
puts stderr "\t\tLIS_CC"
puts stderr "\t\tLIS_RPC"
puts stderr "\t\tLIS_OPENJPEG"
puts stderr "\t\tLIS_ECCODES"
puts stderr "\t\tLIS_NETCDF"
puts stderr "\t\tLIS_HDF4"
puts stderr "\t\tLIS_HDFEOS"
puts stderr "\t\tLIS_HDF5"
puts stderr "\t\tLIS_MODESMF"
puts stderr "\t\tLIS_LIBESMF"
puts stderr "\t\tLIS_MINPACK"
puts stderr "\t\tLIS_CRTM"
puts stderr "\t\tLIS_CRTM_PROF"
puts stderr "\t\tLIS_CMEM"
puts stderr "\t\tLIS_LAPACK"
puts stderr "\t\tLIS_PETSC"
puts stderr "\t\tLDT_ARCH"
puts stderr "\t\tLDT_FC"
puts stderr "\t\tLDT_CC"
puts stderr "\t\tLDT_RPC"
puts stderr "\t\tLDT_OPENJPEG"
puts stderr "\t\tLDT_ECCODES"
puts stderr "\t\tLDT_NETCDF"
puts stderr "\t\tLDT_HDF4"
puts stderr "\t\tLDT_HDFEOS"
puts stderr "\t\tLDT_HDF5"
puts stderr "\t\tLDT_MODESMF"
puts stderr "\t\tLDT_LIBESMF"
puts stderr "\t\tLDT_GDAL"
puts stderr "\t\tLDT_FORTRANGIS"
puts stderr "\t\tLDT_LIBGEOTIFF"
puts stderr "\t\tLVT_ARCH"
puts stderr "\t\tLVT_FC"
puts stderr "\t\tLVT_CC"
puts stderr "\t\tLVT_RPC"
puts stderr "\t\tLVT_OPENJPEG"
puts stderr "\t\tLVT_ECCODES"
puts stderr "\t\tLVT_NETCDF"
puts stderr "\t\tLVT_HDF4"
puts stderr "\t\tLVT_HDFEOS"
puts stderr "\t\tLVT_HDF5"
puts stderr "\t\tLVT_MODESMF"
puts stderr "\t\tLVT_LIBESMF"
puts stderr "\t\tLVT_GDAL"
puts stderr "\t\tLVT_FORTRANGIS"
puts stderr ""
puts stderr "\tThe following modules are loaded:"
puts stderr "\t\tcomp/gcc/13.2.0"
puts stderr "\t\tcomp/intel/2023.2.1"
puts stderr "\t\tmpi/impi/2021.11"
puts stderr "\t\tgit/2.42.0"
puts stderr ""
}

conflict comp mpi

module-whatis "loads the [module-info name] environment"

set modname [module-info name]
set modmode [module-info mode]

module load comp/gcc/13.2.0
module load comp/intel/2023.2.1
module load mpi/impi/2021.11
module load git/2.42.0

set def_lis_rpc /usr/lib64/libtirpc.so
set def_lis_hdf5 /discover/nobackup/projects/lis/libs/sles-15.4/hdf5/1.14.2_intel-2023.2.1
set def_lis_netcdf /discover/nobackup/projects/lis/libs/sles-15.4/netcdf/4.9.2_intel-2023.2.1
set def_lis_openjpeg /discover/nobackup/projects/lis/libs/sles-15.4/openjpeg/2.3.0-150000.3.13.1.x86_64/usr
set def_lis_eccodes /discover/nobackup/projects/lis/libs/sles-15.4/eccodes/2.32.0_intel-2023.2.1
set def_lis_hdf4 /discover/nobackup/projects/lis/libs/sles-15.4/hdf4/4.2.16-2_intel-2023.2.1
set def_lis_hdfeos /discover/nobackup/projects/lis/libs/sles-15.4/hdfeos2/3.0_intel-2023.2.1
set def_lis_modesmf /discover/nobackup/projects/lis/libs/sles-15.4/esmf/8.5.0_intel-2023.2.1_impi-2021.11/mod/modO/Linux.intel.64.intelmpi.default
set def_lis_libesmf /discover/nobackup/projects/lis/libs/sles-15.4/esmf/8.5.0_intel-2023.2.1_impi-2021.11/lib/libO/Linux.intel.64.intelmpi.default
set def_lvt_proj /discover/nobackup/projects/lis/libs/sles-15.4/proj/9.3.0_intel-2023.2.1
set def_ldt_libgeotiff /discover/nobackup/projects/lis/libs/sles-15.4/geotiff/1.7.1_intel-2023.2.1
set def_lvt_gdal /discover/nobackup/projects/lis/libs/sles-15.4/gdal/3.7.2_intel-2023.2.1
set def_lvt_fortrangis /discover/nobackup/projects/lis/libs/sles-15.4/fortrangis/3.0-1_intel-2023.2.1
set def_lis_petsc /discover/nobackup/projects/lis/libs/sles-15.4/petsc/3.20.0_intel-2023.2.1_impi-2021.11
set def_lis_minpack /discover/nobackup/projects/lis/libs/minpack/intel_11_1_038
set def_lis_crtm /discover/nobackup/projects/lis/libs/JCSDA_CRTM/REL-2.0.2.Surface-rev_intel_18_0_3_222
set def_lis_crtm_prof /discover/nobackup/projects/lis/libs/CRTM_Profile_Utility/intel_18_0_3_222
set def_lis_cmem /discover/nobackup/projects/lis/libs/LIS-MEM/intel_18_0_3_222
set def_lis_lapack /discover/nobackup/projects/lis/libs/lapack/3.6.0_intel_14_0_3_174

setenv DEV_ENV LISF_7_5_INTEL_2023_2_1
setenv LIS_ARCH linux_ifc
setenv LIS_SPMD parallel
setenv LIS_FC mpiifort
setenv LIS_CC mpicc
setenv LIS_RPC $def_lis_rpc
setenv LIS_OPENJPEG $def_lis_openjpeg
setenv LIS_ECCODES $def_lis_eccodes
setenv LIS_NETCDF $def_lis_netcdf
setenv LIS_HDF4 $def_lis_hdf4
setenv LIS_HDFEOS $def_lis_hdfeos
setenv LIS_HDF5 $def_lis_hdf5
setenv LIS_MODESMF $def_lis_modesmf
setenv LIS_LIBESMF $def_lis_libesmf
setenv LIS_MINPACK $def_lis_minpack
setenv LIS_CRTM $def_lis_crtm
setenv LIS_CRTM_PROF $def_lis_crtm_prof
setenv LIS_CMEM $def_lis_cmem
setenv LIS_LAPACK $def_lis_lapack
setenv LIS_PETSC $def_lis_petsc

setenv LDT_ARCH linux_ifc
setenv LDT_FC mpiifort
setenv LDT_CC mpicc
setenv LDT_RPC $def_lis_rpc
setenv LDT_OPENJPEG $def_lis_openjpeg
setenv LDT_ECCODES $def_lis_eccodes
setenv LDT_NETCDF $def_lis_netcdf
setenv LDT_HDF4 $def_lis_hdf4
setenv LDT_HDFEOS $def_lis_hdfeos
setenv LDT_HDF5 $def_lis_hdf5
setenv LDT_MODESMF $def_lis_modesmf
setenv LDT_LIBESMF $def_lis_libesmf
setenv LDT_GDAL $def_lvt_gdal
setenv LDT_FORTRANGIS $def_lvt_fortrangis
setenv LDT_LIBGEOTIFF $def_ldt_libgeotiff


setenv LVT_ARCH linux_ifc
setenv LVT_FC mpiifort
setenv LVT_CC mpicc
setenv LVT_RPC $def_lis_rpc
setenv LVT_OPENJPEG $def_lis_openjpeg
setenv LVT_ECCODES $def_lis_eccodes
setenv LVT_NETCDF $def_lis_netcdf
setenv LVT_HDF4 $def_lis_hdf4
setenv LVT_HDFEOS $def_lis_hdfeos
setenv LVT_HDF5 $def_lis_hdf5
setenv LVT_MODESMF $def_lis_modesmf
setenv LVT_LIBESMF $def_lis_libesmf
setenv LVT_GDAL $def_lvt_gdal
setenv LVT_FORTRANGIS $def_lvt_fortrangis


prepend-path LD_LIBRARY_PATH "$def_lis_openjpeg/lib"
prepend-path LD_LIBRARY_PATH "$def_ldt_libgeotiff/lib"
prepend-path LD_LIBRARY_PATH "$def_lvt_proj/lib"
prepend-path LD_LIBRARY_PATH "$def_lvt_gdal/lib"
prepend-path LD_LIBRARY_PATH "$def_lis_hdf4/lib"
prepend-path LD_LIBRARY_PATH "$def_lis_hdf5/lib"
prepend-path LD_LIBRARY_PATH "$def_lis_libesmf"
prepend-path LD_LIBRARY_PATH "$def_lis_netcdf/lib"
prepend-path LD_LIBRARY_PATH "$def_lis_eccodes/lib"
prepend-path LD_LIBRARY_PATH "$def_lis_petsc/lib"
prepend-path PATH "$def_lis_netcdf/bin:$def_lis_eccodes/bin"

# EMK Miniconda3 environment for S2S
prepend-path PATH "/discover/nobackup/projects/usaf_lis/emkemp/miniconda3/20240712_py311_sles15_hpc11/bin"
setenv ESMFMKFILE /discover/nobackup/projects/usaf_lis/emkemp/miniconda3/20240712_py311_sles15_hpc11/lib/esmf.mk
setenv PROJ_LIB /discover/nobackup/projects/usaf_lis/emkemp/miniconda3/20240712_py311_sles15_hpc11/share/proj/
10 changes: 9 additions & 1 deletion lis/utils/usaf/s2s/s2s_app/s2s_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
PARSER.add_argument('-f', '--JOBFILE', required=False, help='job file name')
PARSER.add_argument('-t', '--NTASKS', required=False, help='NTASKS')
PARSER.add_argument('-c', '--CONFIGFILE', required=False, help='config file name')
PARSER.add_argument('-C', '--group_jobs', required=False, help='list of commands for group jobs')
PARSER.add_argument('-H', '--HOURS', required=False, help='time HOURS')
PARSER.add_argument('-j', '--JOBNAME', required=False, help='job-name')
PARSER.add_argument('-w', '--CWD', required=False, help='current working directory')
Expand Down Expand Up @@ -85,4 +86,11 @@
HOURS = ARGS.HOURS
JOBNAME = ARGS.JOBNAME
CWD = ARGS.CWD
utils.job_script(CONFIGFILE, JOBFILE, JOBNAME, NTASKS, str(HOURS), CWD)
if ARGS.group_jobs is None:
utils.job_script(CONFIGFILE, JOBFILE, JOBNAME, NTASKS, str(HOURS), CWD)
else:
with open(ARGS.group_jobs, 'r') as file:
commands = [line.strip() for line in file if line.strip()]
NTASKS = len(commands)

utils.job_script(CONFIGFILE, JOBFILE, JOBNAME, NTASKS, str(HOURS), CWD, group_jobs=commands)
Loading