Skip to content

Commit 9d304a0

Browse files
remove support for SLES12 at NCCS (#83)
2 parents f2635ee + 9632522 commit 9d304a0

File tree

3 files changed

+7
-21
lines changed

3 files changed

+7
-21
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2626

2727
### Removed
2828

29+
- Removed support for SLES12 operating system at NCCS.
30+
2931
### Deprecated
3032

3133
-----------------------------

GEOSldas_App/ldas_setup

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ class LDASsetup:
5151
'MINLON','MAXLON','MINLAT','MAXLAT','EXCLUDE_FILE','INCLUDE_FILE','MWRTM_PATH','GRIDNAME',
5252
'ADAS_EXPDIR', 'BCS_RESOLUTION' ]
5353

54-
# if built on sles15, BUILT_ON_SLES15 is "TRUE", else empty ""
55-
BUILT_ON_SLES15 = "@BUILT_ON_SLES15@"
56-
if BUILT_ON_SLES15 == "TRUE":
57-
self.BUILT_ON_SLES15 = True
58-
else:
59-
self.BUILT_ON_SLES15 = False
6054

6155
self.GEOS_SITE = "@GEOS_SITE@"
6256

@@ -705,10 +699,7 @@ class LDASsetup:
705699
print ('\nCorrect the tile file if it is an old EASE tile format... \n')
706700
EASEtile=self.bcsdir+'/MAPL_'+short_tile
707701
cmd = self.bindir + '/preprocess_ldas.x correctease '+ tile + ' '+ EASEtile
708-
if self.BUILT_ON_SLES15 :
709-
print ("Executables were built on SLES15 and must be run on SLES15: " + cmd)
710-
else:
711-
print ("cmd: " + cmd)
702+
print ("cmd: " + cmd)
712703

713704
sp.call(shlex.split(cmd))
714705

@@ -1358,10 +1349,8 @@ class LDASsetup:
13581349
constraint='cas'
13591350
if self.GEOS_SITE == "NAS":
13601351
constraint = 'cas_ait'
1361-
elif self.BUILT_ON_SLES15:
1362-
constraint = 'mil'
1363-
else:
1364-
assert int(self.rqdRmInp['ntasks-per-node']) <= 46, 'ntasks-per-node should be <=46 for cas'
1352+
elif self.GEOS_SITE == "NCCS":
1353+
constraint = '"[mil|cas]"'
13651354

13661355
SBATCHQSUB = 'sbatch'
13671356
if self.GEOS_SITE == 'NAS':
@@ -1393,7 +1382,6 @@ class LDASsetup:
13931382
MY_ADAS_EXPDIR = self.adas_expdir,
13941383
MY_EXPDIR = self.expdir,
13951384
DETECTED_MPI_STACK = DETECTED_MPI_STACK,
1396-
BUILT_ON_SLES15 = str(self.BUILT_ON_SLES15).upper()
13971385
)
13981386

13991387
with open('lenkf.j','wt') as fout :

GEOSldas_App/lenkf_j_template.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,8 @@
8787
8888
else if ( ${{MPI_STACK}} == "intelmpi" ) then
8989
90-
setenv BUILT_ON_SLES15 {BUILT_ON_SLES15}
91-
92-
if ( ${{BUILT_ON_SLES15}} == TRUE ) then
93-
setenv I_MPI_FABRICS shm:ofi
94-
setenv I_MPI_OFI_PROVIDER psm3
95-
endif # BUILT_ON_SLES15
90+
setenv I_MPI_FABRICS shm:ofi
91+
setenv I_MPI_OFI_PROVIDER psm3
9692
9793
endif # MPI_STACK
9894

0 commit comments

Comments
 (0)