Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Added optional SLURM "constraint".
- Added functionality to run on tile space of stretched cube-sphere grids.
- Added python package for post-processing ObsFcstAna output.

Expand Down
17 changes: 10 additions & 7 deletions GEOSldas_App/ldas_setup
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class LDASsetup:
# ------
# Optional resource manager input fields
# ------
optSlurmInpKeys = ['job_name', 'qos', 'oserver_nodes', 'writers-per-node']
optSlurmInpKeys = ['job_name', 'qos', 'oserver_nodes', 'writers-per-node', 'constraint']


# ===============================================================================================
Expand Down Expand Up @@ -1570,15 +1570,17 @@ class LDASsetup:
'.'.join([expid, 'ldas_err', myDateTime, 'txt']),
]),
self.rundir)
constraint='cas'
if self.GEOS_SITE == "NAS":
constraint = 'cas_ait'
elif self.GEOS_SITE == "NCCS":
constraint = '"[mil|cas]"'

constraint = '"[mil|cas]"'
if self.GEOS_SITE == "NAS" :
constraint = 'cas_ait'

if 'constraint' in self.optRmInp:
constraint = self.optRmInp['constraint']

SBATCHQSUB = 'sbatch'
if self.GEOS_SITE == 'NAS':
SBATCHQSUB = 'qsub'
SBATCHQSUB = 'qsub'

DETECTED_MPI_STACK = "@MPI_STACK@"

Expand Down Expand Up @@ -1860,6 +1862,7 @@ def _printRmInputKeys(rqdRmInpKeys, optRmInpKeys):
print ('# - writers-per-node = tasks per oserver_node for writing ( default is 5, for future use ),')
print ('# IMPORTANT REQUIREMENT: total #writers = writers-per-node * oserver_nodes >= 2')
print ('# Jobs will hang when oserver_nodes = writers-per-node = 1.')
print ('# - constraint = name of chip set(s) (NCCS default is "[mil|cas]", NAS default is "cas_ait").')
print ('#')
for key in optRmInpKeys:
print ('#'+key + ':')
Expand Down