Skip to content

Commit 6227818

Browse files
sdrabenhsdrabenh
authored
Merge branch 'develop' into bugfix/705-fix-dataatm-hist
2 parents cafe07a + 800f759 commit 6227818

File tree

4 files changed

+92
-288
lines changed

4 files changed

+92
-288
lines changed

‎gcm_setup‎

Lines changed: 23 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -415,55 +415,30 @@ ASKPROC:
415415

416416
if ( $SITE == 'NCCS' ) then
417417

418-
set BUILT_ON_SLES15 = @BUILT_ON_SLES15@
419-
420-
if ("$BUILT_ON_SLES15" == "TRUE") then
421-
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
422-
echo " ${C2}mil (Milan)${CN} (default)"
423-
echo " ${C2}cas (Cascade Lake)${CN}"
424-
echo " "
425-
set MODEL = `echo $<`
426-
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
427-
if ( .$MODEL == .) then
428-
set MODEL = 'mil'
429-
endif
430-
431-
if( $MODEL != 'mil' & \
432-
$MODEL != 'cas' ) goto ASKPROC
433-
434-
if ($MODEL == 'mil') then
435-
# We save a couple processes for the kernel
436-
set NCPUS_PER_NODE = 126
437-
else if ($MODEL == 'cas') then
438-
# NCCS currently recommends that users do not run with
439-
# 48 cores per node on SCU16 due to OS issues and
440-
# recommends that CPU-intensive works run with 46 or less
441-
# cores. As 45 is a multiple of 3, it's the best value
442-
# that doesn't waste too much
443-
#set NCPUS_PER_NODE = 48
444-
set NCPUS_PER_NODE = 45
445-
endif
446-
else
447-
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
448-
echo " ${C2}cas (Cascade Lake) (default)${CN}"
449-
echo " "
450-
set MODEL = `echo $<`
451-
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
452-
if ( .$MODEL == .) then
453-
set MODEL = 'cas'
454-
endif
455-
456-
if( $MODEL != 'cas' ) goto ASKPROC
418+
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
419+
echo " ${C2}mil (Milan)${CN} (default)"
420+
echo " ${C2}cas (Cascade Lake)${CN}"
421+
echo " "
422+
set MODEL = `echo $<`
423+
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
424+
if ( .$MODEL == .) then
425+
set MODEL = 'mil'
426+
endif
457427

458-
if ($MODEL == 'cas') then
459-
# NCCS currently recommends that users do not run with
460-
# 48 cores per node on SCU16 due to OS issues and
461-
# recommends that CPU-intensive works run with 46 or less
462-
# cores. As 45 is a multiple of 3, it's the best value
463-
# that doesn't waste too much
464-
#set NCPUS_PER_NODE = 48
465-
set NCPUS_PER_NODE = 45
466-
endif
428+
if( $MODEL != 'mil' & \
429+
$MODEL != 'cas' ) goto ASKPROC
430+
431+
if ($MODEL == 'mil') then
432+
# We save a couple processes for the kernel
433+
set NCPUS_PER_NODE = 126
434+
else if ($MODEL == 'cas') then
435+
# NCCS currently recommends that users do not run with
436+
# 48 cores per node on SCU16 due to OS issues and
437+
# recommends that CPU-intensive works run with 46 or less
438+
# cores. As 45 is a multiple of 3, it's the best value
439+
# that doesn't waste too much
440+
#set NCPUS_PER_NODE = 48
441+
set NCPUS_PER_NODE = 45
467442
endif
468443

469444
else if ( $SITE == 'NAS' ) then
@@ -2287,7 +2262,6 @@ if ( $SITE == 'NCCS' ) then
22872262
# NOTE: When Cascade Lake is on SLES15, the following flags
22882263
# might need to be Milan only
22892264

2290-
if ("$BUILT_ON_SLES15" == "TRUE") then
22912265
cat >> $HOMDIR/SETENV.commands << EOF
22922266
setenv I_MPI_ADJUST_ALLREDUCE 12
22932267
setenv I_MPI_ADJUST_GATHERV 3
@@ -2296,29 +2270,6 @@ setenv I_MPI_FABRICS shm:ofi
22962270
setenv I_MPI_OFI_PROVIDER psm3
22972271
EOF
22982272

2299-
else
2300-
2301-
cat >> $HOMDIR/SETENV.commands << EOF
2302-
setenv I_MPI_ADJUST_ALLREDUCE 12
2303-
setenv I_MPI_ADJUST_GATHERV 3
2304-
2305-
setenv I_MPI_SHM_HEAP_VSIZE 512
2306-
setenv PSM2_MEMORY large
2307-
EOF
2308-
2309-
# Testing at NCCS showed these caused a crash at higher resolutions at
2310-
# restart read
2311-
if ( $USING_SINGULARITY == FALSE ) then
2312-
2313-
cat >> $HOMDIR/SETENV.commands << EOF
2314-
setenv I_MPI_EXTRA_FILESYSTEM 1
2315-
setenv I_MPI_EXTRA_FILESYSTEM_FORCE gpfs
2316-
EOF
2317-
2318-
endif # if NOT Singularity
2319-
2320-
endif # if SLES15
2321-
23222273
endif # if NCCS
23232274

23242275
endif # if mpi

‎geoschemchem_setup‎

Lines changed: 23 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -415,55 +415,30 @@ ASKPROC:
415415

416416
if ( $SITE == 'NCCS' ) then
417417

418-
set BUILT_ON_SLES15 = @BUILT_ON_SLES15@
419-
420-
if ("$BUILT_ON_SLES15" == "TRUE") then
421-
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
422-
echo " ${C2}mil (Milan)${CN} (default)"
423-
echo " ${C2}cas (Cascade Lake)${CN}"
424-
echo " "
425-
set MODEL = `echo $<`
426-
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
427-
if ( .$MODEL == .) then
428-
set MODEL = 'mil'
429-
endif
430-
431-
if( $MODEL != 'mil' & \
432-
$MODEL != 'cas' ) goto ASKPROC
433-
434-
if ($MODEL == 'mil') then
435-
# We save a couple processes for the kernel
436-
set NCPUS_PER_NODE = 126
437-
else if ($MODEL == 'cas') then
438-
# NCCS currently recommends that users do not run with
439-
# 48 cores per node on SCU16 due to OS issues and
440-
# recommends that CPU-intensive works run with 46 or less
441-
# cores. As 45 is a multiple of 3, it's the best value
442-
# that doesn't waste too much
443-
#set NCPUS_PER_NODE = 48
444-
set NCPUS_PER_NODE = 45
445-
endif
446-
else
447-
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
448-
echo " ${C2}cas (Cascade Lake) (default)${CN}"
449-
echo " "
450-
set MODEL = `echo $<`
451-
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
452-
if ( .$MODEL == .) then
453-
set MODEL = 'cas'
454-
endif
455-
456-
if( $MODEL != 'cas' ) goto ASKPROC
418+
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
419+
echo " ${C2}mil (Milan)${CN} (default)"
420+
echo " ${C2}cas (Cascade Lake)${CN}"
421+
echo " "
422+
set MODEL = `echo $<`
423+
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
424+
if ( .$MODEL == .) then
425+
set MODEL = 'mil'
426+
endif
457427

458-
if ($MODEL == 'cas') then
459-
# NCCS currently recommends that users do not run with
460-
# 48 cores per node on SCU16 due to OS issues and
461-
# recommends that CPU-intensive works run with 46 or less
462-
# cores. As 45 is a multiple of 3, it's the best value
463-
# that doesn't waste too much
464-
#set NCPUS_PER_NODE = 48
465-
set NCPUS_PER_NODE = 45
466-
endif
428+
if( $MODEL != 'mil' & \
429+
$MODEL != 'cas' ) goto ASKPROC
430+
431+
if ($MODEL == 'mil') then
432+
# We save a couple processes for the kernel
433+
set NCPUS_PER_NODE = 126
434+
else if ($MODEL == 'cas') then
435+
# NCCS currently recommends that users do not run with
436+
# 48 cores per node on SCU16 due to OS issues and
437+
# recommends that CPU-intensive works run with 46 or less
438+
# cores. As 45 is a multiple of 3, it's the best value
439+
# that doesn't waste too much
440+
#set NCPUS_PER_NODE = 48
441+
set NCPUS_PER_NODE = 45
467442
endif
468443

469444
else if ( $SITE == 'NAS' ) then
@@ -2317,7 +2292,6 @@ if ( $SITE == 'NCCS' ) then
23172292
# NOTE: When Cascade Lake is on SLES15, the following flags
23182293
# might need to be Milan only
23192294

2320-
if ("$BUILT_ON_SLES15" == "TRUE") then
23212295
cat >> $HOMDIR/SETENV.commands << EOF
23222296
setenv I_MPI_ADJUST_ALLREDUCE 12
23232297
setenv I_MPI_ADJUST_GATHERV 3
@@ -2326,29 +2300,6 @@ setenv I_MPI_FABRICS shm:ofi
23262300
setenv I_MPI_OFI_PROVIDER psm3
23272301
EOF
23282302

2329-
else
2330-
2331-
cat >> $HOMDIR/SETENV.commands << EOF
2332-
setenv I_MPI_ADJUST_ALLREDUCE 12
2333-
setenv I_MPI_ADJUST_GATHERV 3
2334-
2335-
setenv I_MPI_SHM_HEAP_VSIZE 512
2336-
setenv PSM2_MEMORY large
2337-
EOF
2338-
2339-
# Testing at NCCS showed these caused a crash at higher resolutions at
2340-
# restart read
2341-
if ( $USING_SINGULARITY == FALSE ) then
2342-
2343-
cat >> $HOMDIR/SETENV.commands << EOF
2344-
setenv I_MPI_EXTRA_FILESYSTEM 1
2345-
setenv I_MPI_EXTRA_FILESYSTEM_FORCE gpfs
2346-
EOF
2347-
2348-
endif # if NOT Singularity
2349-
2350-
endif # if SLES15
2351-
23522303
endif # if NCCS
23532304

23542305
endif # if mpi

‎gmichem_setup‎

Lines changed: 23 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -415,55 +415,30 @@ ASKPROC:
415415

416416
if ( $SITE == 'NCCS' ) then
417417

418-
set BUILT_ON_SLES15 = @BUILT_ON_SLES15@
419-
420-
if ("$BUILT_ON_SLES15" == "TRUE") then
421-
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
422-
echo " ${C2}mil (Milan)${CN} (default)"
423-
echo " ${C2}cas (Cascade Lake)${CN}"
424-
echo " "
425-
set MODEL = `echo $<`
426-
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
427-
if ( .$MODEL == .) then
428-
set MODEL = 'mil'
429-
endif
430-
431-
if( $MODEL != 'mil' & \
432-
$MODEL != 'cas' ) goto ASKPROC
433-
434-
if ($MODEL == 'mil') then
435-
# We save a couple processes for the kernel
436-
set NCPUS_PER_NODE = 126
437-
else if ($MODEL == 'cas') then
438-
# NCCS currently recommends that users do not run with
439-
# 48 cores per node on SCU16 due to OS issues and
440-
# recommends that CPU-intensive works run with 46 or less
441-
# cores. As 45 is a multiple of 3, it's the best value
442-
# that doesn't waste too much
443-
#set NCPUS_PER_NODE = 48
444-
set NCPUS_PER_NODE = 45
445-
endif
446-
else
447-
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
448-
echo " ${C2}cas (Cascade Lake) (default)${CN}"
449-
echo " "
450-
set MODEL = `echo $<`
451-
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
452-
if ( .$MODEL == .) then
453-
set MODEL = 'cas'
454-
endif
455-
456-
if( $MODEL != 'cas' ) goto ASKPROC
418+
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
419+
echo " ${C2}mil (Milan)${CN} (default)"
420+
echo " ${C2}cas (Cascade Lake)${CN}"
421+
echo " "
422+
set MODEL = `echo $<`
423+
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
424+
if ( .$MODEL == .) then
425+
set MODEL = 'mil'
426+
endif
457427

458-
if ($MODEL == 'cas') then
459-
# NCCS currently recommends that users do not run with
460-
# 48 cores per node on SCU16 due to OS issues and
461-
# recommends that CPU-intensive works run with 46 or less
462-
# cores. As 45 is a multiple of 3, it's the best value
463-
# that doesn't waste too much
464-
#set NCPUS_PER_NODE = 48
465-
set NCPUS_PER_NODE = 45
466-
endif
428+
if( $MODEL != 'mil' & \
429+
$MODEL != 'cas' ) goto ASKPROC
430+
431+
if ($MODEL == 'mil') then
432+
# We save a couple processes for the kernel
433+
set NCPUS_PER_NODE = 126
434+
else if ($MODEL == 'cas') then
435+
# NCCS currently recommends that users do not run with
436+
# 48 cores per node on SCU16 due to OS issues and
437+
# recommends that CPU-intensive works run with 46 or less
438+
# cores. As 45 is a multiple of 3, it's the best value
439+
# that doesn't waste too much
440+
#set NCPUS_PER_NODE = 48
441+
set NCPUS_PER_NODE = 45
467442
endif
468443

469444
else if ( $SITE == 'NAS' ) then
@@ -2489,7 +2464,6 @@ if ( $SITE == 'NCCS' ) then
24892464
# NOTE: When Cascade Lake is on SLES15, the following flags
24902465
# might need to be Milan only
24912466

2492-
if ("$BUILT_ON_SLES15" == "TRUE") then
24932467
cat >> $HOMDIR/SETENV.commands << EOF
24942468
setenv I_MPI_ADJUST_ALLREDUCE 12
24952469
setenv I_MPI_ADJUST_GATHERV 3
@@ -2498,29 +2472,6 @@ setenv I_MPI_FABRICS shm:ofi
24982472
setenv I_MPI_OFI_PROVIDER psm3
24992473
EOF
25002474

2501-
else
2502-
2503-
cat >> $HOMDIR/SETENV.commands << EOF
2504-
setenv I_MPI_ADJUST_ALLREDUCE 12
2505-
setenv I_MPI_ADJUST_GATHERV 3
2506-
2507-
setenv I_MPI_SHM_HEAP_VSIZE 512
2508-
setenv PSM2_MEMORY large
2509-
EOF
2510-
2511-
# Testing at NCCS showed these caused a crash at higher resolutions at
2512-
# restart read
2513-
if ( $USING_SINGULARITY == FALSE ) then
2514-
2515-
cat >> $HOMDIR/SETENV.commands << EOF
2516-
setenv I_MPI_EXTRA_FILESYSTEM 1
2517-
setenv I_MPI_EXTRA_FILESYSTEM_FORCE gpfs
2518-
EOF
2519-
2520-
endif # if NOT Singularity
2521-
2522-
endif # if SLES15
2523-
25242475
endif # if NCCS
25252476

25262477
endif # if mpi

0 commit comments

Comments
 (0)