Skip to content

Commit 878ad9a

Browse files
sdrabenhsdrabenh
authored
Merge pull request #688 from GEOS-ESM/feature/mathomp4/remove-skylake
v11: Remove Skylake at NCCS
2 parents 6f3e5af + 8723c2c commit 878ad9a

File tree

4 files changed

+24
-40
lines changed

4 files changed

+24
-40
lines changed

‎gcm_setup‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,6 @@ if ( $SITE == 'NCCS' ) then
445445
endif
446446
else
447447
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
448-
echo " ${C2}sky (Skylake)${CN}"
449448
echo " ${C2}cas (Cascade Lake) (default)${CN}"
450449
echo " "
451450
set MODEL = `echo $<`
@@ -454,12 +453,9 @@ if ( $SITE == 'NCCS' ) then
454453
set MODEL = 'cas'
455454
endif
456455

457-
if( $MODEL != 'sky' & \
458-
$MODEL != 'cas' ) goto ASKPROC
456+
if( $MODEL != 'cas' ) goto ASKPROC
459457

460-
if ($MODEL == 'sky') then
461-
set NCPUS_PER_NODE = 40
462-
else if ($MODEL == 'cas') then
458+
if ($MODEL == 'cas') then
463459
# NCCS currently recommends that users do not run with
464460
# 48 cores per node on SCU16 due to OS issues and
465461
# recommends that CPU-intensive works run with 46 or less
@@ -475,9 +471,9 @@ else if ( $SITE == 'NAS' ) then
475471
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
476472
echo " ${C2}has (Haswell)${CN}"
477473
echo " ${C2}bro (Broadwell)${CN}"
478-
echo " ${C2}sky (Skylake)${CN} (default)"
474+
echo " ${C2}sky (Skylake)${CN}"
479475
echo " ${C2}cas (Cascade Lake)${CN}"
480-
echo " ${C2}rom (AMD Rome)${CN}"
476+
echo " ${C2}rom (AMD Rome) (default)${CN}"
481477
echo " ${C2}mil (AMD Milan)${CN}"
482478
echo " "
483479
echo " NOTE Due to how FV3 is compiled by default, Sandy Bridge"
@@ -486,7 +482,7 @@ else if ( $SITE == 'NAS' ) then
486482
set MODEL = `echo $<`
487483
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
488484
if ( .$MODEL == .) then
489-
set MODEL = 'sky'
485+
set MODEL = 'rom'
490486
endif
491487

492488
if( $MODEL != 'has' & \

‎geoschemchem_setup‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ endif
3131
# Build Directory Locations
3232
#######################################################################
3333

34-
# Set Current Working Path to gcm_setup
35-
# -------------------------------------
34+
# Set Current Working Path to geoschemchem_setup
35+
# ----------------------------------------------
3636
setenv ARCH `uname -s`
3737
setenv NODE `uname -n`
3838

@@ -445,7 +445,6 @@ if ( $SITE == 'NCCS' ) then
445445
endif
446446
else
447447
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
448-
echo " ${C2}sky (Skylake)${CN}"
449448
echo " ${C2}cas (Cascade Lake) (default)${CN}"
450449
echo " "
451450
set MODEL = `echo $<`
@@ -454,12 +453,9 @@ if ( $SITE == 'NCCS' ) then
454453
set MODEL = 'cas'
455454
endif
456455

457-
if( $MODEL != 'sky' & \
458-
$MODEL != 'cas' ) goto ASKPROC
456+
if( $MODEL != 'cas' ) goto ASKPROC
459457

460-
if ($MODEL == 'sky') then
461-
set NCPUS_PER_NODE = 40
462-
else if ($MODEL == 'cas') then
458+
if ($MODEL == 'cas') then
463459
# NCCS currently recommends that users do not run with
464460
# 48 cores per node on SCU16 due to OS issues and
465461
# recommends that CPU-intensive works run with 46 or less
@@ -475,9 +471,9 @@ else if ( $SITE == 'NAS' ) then
475471
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
476472
echo " ${C2}has (Haswell)${CN}"
477473
echo " ${C2}bro (Broadwell)${CN}"
478-
echo " ${C2}sky (Skylake)${CN} (default)"
474+
echo " ${C2}sky (Skylake)${CN}"
479475
echo " ${C2}cas (Cascade Lake)${CN}"
480-
echo " ${C2}rom (AMD Rome)${CN}"
476+
echo " ${C2}rom (AMD Rome) (default)${CN}"
481477
echo " ${C2}mil (AMD Milan)${CN}"
482478
echo " "
483479
echo " NOTE Due to how FV3 is compiled by default, Sandy Bridge"
@@ -486,7 +482,7 @@ else if ( $SITE == 'NAS' ) then
486482
set MODEL = `echo $<`
487483
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
488484
if ( .$MODEL == .) then
489-
set MODEL = 'sky'
485+
set MODEL = 'rom'
490486
endif
491487

492488
if( $MODEL != 'has' & \

‎gmichem_setup‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,6 @@ if ( $SITE == 'NCCS' ) then
445445
endif
446446
else
447447
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
448-
echo " ${C2}sky (Skylake)${CN}"
449448
echo " ${C2}cas (Cascade Lake) (default)${CN}"
450449
echo " "
451450
set MODEL = `echo $<`
@@ -454,12 +453,9 @@ if ( $SITE == 'NCCS' ) then
454453
set MODEL = 'cas'
455454
endif
456455

457-
if( $MODEL != 'sky' & \
458-
$MODEL != 'cas' ) goto ASKPROC
456+
if( $MODEL != 'cas' ) goto ASKPROC
459457

460-
if ($MODEL == 'sky') then
461-
set NCPUS_PER_NODE = 40
462-
else if ($MODEL == 'cas') then
458+
if ($MODEL == 'cas') then
463459
# NCCS currently recommends that users do not run with
464460
# 48 cores per node on SCU16 due to OS issues and
465461
# recommends that CPU-intensive works run with 46 or less
@@ -475,9 +471,9 @@ else if ( $SITE == 'NAS' ) then
475471
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
476472
echo " ${C2}has (Haswell)${CN}"
477473
echo " ${C2}bro (Broadwell)${CN}"
478-
echo " ${C2}sky (Skylake)${CN} (default)"
474+
echo " ${C2}sky (Skylake)${CN}"
479475
echo " ${C2}cas (Cascade Lake)${CN}"
480-
echo " ${C2}rom (AMD Rome)${CN}"
476+
echo " ${C2}rom (AMD Rome) (default)${CN}"
481477
echo " ${C2}mil (AMD Milan)${CN}"
482478
echo " "
483479
echo " NOTE Due to how FV3 is compiled by default, Sandy Bridge"
@@ -486,7 +482,7 @@ else if ( $SITE == 'NAS' ) then
486482
set MODEL = `echo $<`
487483
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
488484
if ( .$MODEL == .) then
489-
set MODEL = 'sky'
485+
set MODEL = 'rom'
490486
endif
491487

492488
if( $MODEL != 'has' & \

‎stratchem_setup‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ endif
3131
# Build Directory Locations
3232
#######################################################################
3333

34-
# Set Current Working Path to gcm_setup
35-
# -------------------------------------
34+
# Set Current Working Path to stratchem_setup
35+
# -------------------------------------------
3636
setenv ARCH `uname -s`
3737
setenv NODE `uname -n`
3838

@@ -445,7 +445,6 @@ if ( $SITE == 'NCCS' ) then
445445
endif
446446
else
447447
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
448-
echo " ${C2}sky (Skylake)${CN}"
449448
echo " ${C2}cas (Cascade Lake) (default)${CN}"
450449
echo " "
451450
set MODEL = `echo $<`
@@ -454,12 +453,9 @@ if ( $SITE == 'NCCS' ) then
454453
set MODEL = 'cas'
455454
endif
456455

457-
if( $MODEL != 'sky' & \
458-
$MODEL != 'cas' ) goto ASKPROC
456+
if( $MODEL != 'cas' ) goto ASKPROC
459457

460-
if ($MODEL == 'sky') then
461-
set NCPUS_PER_NODE = 40
462-
else if ($MODEL == 'cas') then
458+
if ($MODEL == 'cas') then
463459
# NCCS currently recommends that users do not run with
464460
# 48 cores per node on SCU16 due to OS issues and
465461
# recommends that CPU-intensive works run with 46 or less
@@ -475,9 +471,9 @@ else if ( $SITE == 'NAS' ) then
475471
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
476472
echo " ${C2}has (Haswell)${CN}"
477473
echo " ${C2}bro (Broadwell)${CN}"
478-
echo " ${C2}sky (Skylake)${CN} (default)"
474+
echo " ${C2}sky (Skylake)${CN}"
479475
echo " ${C2}cas (Cascade Lake)${CN}"
480-
echo " ${C2}rom (AMD Rome)${CN}"
476+
echo " ${C2}rom (AMD Rome) (default)${CN}"
481477
echo " ${C2}mil (AMD Milan)${CN}"
482478
echo " "
483479
echo " NOTE Due to how FV3 is compiled by default, Sandy Bridge"
@@ -486,7 +482,7 @@ else if ( $SITE == 'NAS' ) then
486482
set MODEL = `echo $<`
487483
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
488484
if ( .$MODEL == .) then
489-
set MODEL = 'sky'
485+
set MODEL = 'rom'
490486
endif
491487

492488
if( $MODEL != 'has' & \

0 commit comments

Comments
 (0)