Skip to content

Commit

Permalink
Merge branch 'azamat/homme/fix-io-init' (PR #1684)
Browse files Browse the repository at this point in the history
Initialize HOMME netcdf file open var:
netcdf_io_mod::nf_open_file routine does not initialize ncFileID,
which is used by other routines to drive MPI calls. All IO tasks
should have a non-negative value for ncFileID (e.g. masterproc
has ncFileID=0) to avoid hangs.
This PR sets it to 0 for all tasks that call nf_open_file.

Also, this PR updates Mira/Cetus machine config:
* link to correct HDF5 and Zlib libraries
* use pre-installed cprnc, instead of building a new one
* suppress nested-omp compiler warnings.

[BFB]
Fixes #1683
  • Loading branch information
amametjanov committed Aug 1, 2017
2 parents fb72e38 + 77b999e commit 96720e1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions config/acme/machines/config_compilers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ for mct, etc.
<FC_AUTO_R8> -qrealsize=8 </FC_AUTO_R8>
<ADD_FFLAGS DEBUG="FALSE"> -O2 -qstrict -Q </ADD_FFLAGS>
<ADD_CFLAGS DEBUG="FALSE"> -O3 </ADD_CFLAGS>
<ADD_FFLAGS DEBUG="FALSE" compile_threaded="true"> -qsmp=omp:nested_par </ADD_FFLAGS>
<ADD_CFLAGS DEBUG="FALSE" compile_threaded="true"> -qsmp=omp:nested_par </ADD_CFLAGS>
<ADD_FFLAGS DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:nested_par:noopt </ADD_FFLAGS>
<ADD_CFLAGS DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:nested_par:noopt </ADD_CFLAGS>
<ADD_FFLAGS DEBUG="FALSE" compile_threaded="true"> -qsmp=omp:nested_par -qsuppress=1520-045 </ADD_FFLAGS>
<ADD_CFLAGS DEBUG="FALSE" compile_threaded="true"> -qsmp=omp:nested_par -qsuppress=1520-045 </ADD_CFLAGS>
<ADD_FFLAGS DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:nested_par:noopt -qsuppress=1520-045 </ADD_FFLAGS>
<ADD_CFLAGS DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:nested_par:noopt -qsuppress=1520-045 </ADD_CFLAGS>
<ADD_FFLAGS DEBUG="TRUE"> -qinitauto=7FF7FFFF -qflttrap=ov:zero:inv:en </ADD_FFLAGS>
<ADD_FFLAGS DEBUG="TRUE" MODEL="pop"> -C </ADD_FFLAGS>
<HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
Expand Down

0 comments on commit 96720e1

Please sign in to comment.