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

Auto PR - develop → MAPL-v3 - Attempts to add Intel MPI support #58

Merged
merged 6 commits into from
Oct 22, 2024
Merged

Auto PR - develop → MAPL-v3 - Attempts to add Intel MPI support #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a37a4ae
Attempts to add Intel MPI support
mathomp4 Jul 25, 2024
1341af9
Better logic
mathomp4 Jul 25, 2024
d3755de
Make string
mathomp4 Jul 25, 2024
6707075
Use self
mathomp4 Jul 25, 2024
704389d
Add indents
mathomp4 Oct 2, 2024
2bbd3a0
Add Intel MPI support #57
gmao-rreichle Oct 22, 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: 3 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- More optimal distribution of tiles on processors for cubed-sphere tile space.
- Updates to scripting to allow for Intel MPI

### Fixed

Expand Down Expand Up @@ -43,9 +44,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Moved external `GEOSgcm_GridComp` repository to under `GEOSldas/src/Components` for
consistency with directory structure of GEOSgcm and GEOSadas ([PR #27](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/27), [PR #30](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/30)).
- Changed lenkf.j.template to python string ([PR #16](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/16)).
- Changed lenkf.j.template to python string ([PR #16](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/16)).



-----------------------------

## [v1.0.1] - 2024-04-10
Expand Down
10 changes: 7 additions & 3 deletions GEOSldas_App/ldas_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ class LDASsetup:
wemin_out = self.rqdExeInp['WEMIN_OUT']


tmp_f2g_file = tempfile.NamedTemporaryFile(delete=False)
tmp_f2g_file = tempfile.NamedTemporaryFile(delete=False)
cmd = self.bindir +'/preprocess_ldas.x c_f2g ' + tile + ' ' + self.domain_def.name + ' '+ self.out_path + ' ' + catchment_def + ' ' + exp_id + ' ' + _y4m2d2h2m2 + ' '+ dzsf + ' ' + tmp_f2g_file.name

print ('Creating f2g file: '+ tmp_f2g_file.name +'....\n')
Expand Down Expand Up @@ -901,7 +901,7 @@ class LDASsetup:
config['input']['shared']['agrid'] = 'C180'
config['input']['shared']['ogrid'] = '1440x720'
config['input']['shared']['omodel'] = 'data'

catch_obj = catchANDcn(config_obj = config)
catch_obj.remap()

Expand Down Expand Up @@ -1367,6 +1367,8 @@ class LDASsetup:
if self.GEOS_SITE == 'NAS':
SBATCHQSUB = 'qsub'

DETECTED_MPI_STACK = "@MPI_STACK@"

job_head = job_directive[self.GEOS_SITE]
lenkf_str= (job_head+job_body).format(
SBATCHQSUB = SBATCHQSUB,
Expand All @@ -1389,7 +1391,9 @@ class LDASsetup:
MY_LADAS_COUPLING = str(self.ladas_coupling),
MY_ENSEMBLE_FORCING= self.rqdExeInp.get('ENSEMBLE_FORCING', 'NO').upper(),
MY_ADAS_EXPDIR = self.adas_expdir,
MY_EXPDIR = self.expdir
MY_EXPDIR = self.expdir,
DETECTED_MPI_STACK = DETECTED_MPI_STACK,
BUILT_ON_SLES15 = str(self.BUILT_ON_SLES15).upper()
)

with open('lenkf.j','wt') as fout :
Expand Down
Loading
Loading