Skip to content

Commit 704389d

Browse files
committed
Add indents
1 parent 6707075 commit 704389d

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
### Changed
1515

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

1819
### Fixed
1920

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

4445
- Moved external `GEOSgcm_GridComp` repository to under `GEOSldas/src/Components` for
4546
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)).
46-
- Changed lenkf.j.template to python string ([PR #16](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/16)).
47+
- Changed lenkf.j.template to python string ([PR #16](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/16)).
48+
4749

48-
4950
-----------------------------
5051

5152
## [v1.0.1] - 2024-04-10

GEOSldas_App/lenkf_j_template.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,32 +67,32 @@
6767
6868
if ( ${{MPI_STACK}} == "openmpi" ) then
6969
70-
# OPENMPI flags
71-
# Turn off warning about TMPDIR on NFS
72-
setenv OMPI_MCA_shmem_mmap_enable_nfs_warning 0
73-
# pre-connect MPI procs on mpi_init
74-
setenv OMPI_MCA_mpi_preconnect_all 1
75-
setenv OMPI_MCA_coll_tuned_bcast_algorithm 7
76-
setenv OMPI_MCA_coll_tuned_scatter_algorithm 2
77-
setenv OMPI_MCA_coll_tuned_reduce_scatter_algorithm 3
78-
setenv OMPI_MCA_coll_tuned_allreduce_algorithm 3
79-
setenv OMPI_MCA_coll_tuned_allgather_algorithm 4
80-
setenv OMPI_MCA_coll_tuned_allgatherv_algorithm 3
81-
setenv OMPI_MCA_coll_tuned_gather_algorithm 1
82-
setenv OMPI_MCA_coll_tuned_barrier_algorithm 0
83-
# required for a tuned flag to be effective
84-
setenv OMPI_MCA_coll_tuned_use_dynamic_rules 1
85-
# disable file locks
86-
setenv OMPI_MCA_sharedfp "^lockedfile,individual"
70+
# OPENMPI flags
71+
# Turn off warning about TMPDIR on NFS
72+
setenv OMPI_MCA_shmem_mmap_enable_nfs_warning 0
73+
# pre-connect MPI procs on mpi_init
74+
setenv OMPI_MCA_mpi_preconnect_all 1
75+
setenv OMPI_MCA_coll_tuned_bcast_algorithm 7
76+
setenv OMPI_MCA_coll_tuned_scatter_algorithm 2
77+
setenv OMPI_MCA_coll_tuned_reduce_scatter_algorithm 3
78+
setenv OMPI_MCA_coll_tuned_allreduce_algorithm 3
79+
setenv OMPI_MCA_coll_tuned_allgather_algorithm 4
80+
setenv OMPI_MCA_coll_tuned_allgatherv_algorithm 3
81+
setenv OMPI_MCA_coll_tuned_gather_algorithm 1
82+
setenv OMPI_MCA_coll_tuned_barrier_algorithm 0
83+
# required for a tuned flag to be effective
84+
setenv OMPI_MCA_coll_tuned_use_dynamic_rules 1
85+
# disable file locks
86+
setenv OMPI_MCA_sharedfp "^lockedfile,individual"
8787
8888
else if ( ${{MPI_STACK}} == "intelmpi" ) then
8989
90-
setenv BUILT_ON_SLES15 {BUILT_ON_SLES15}
90+
setenv BUILT_ON_SLES15 {BUILT_ON_SLES15}
9191
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
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
9696
9797
endif # MPI_STACK
9898

0 commit comments

Comments
 (0)