Skip to content

Commit

Permalink
Merge branch 'xylar/mpas-framework/add-openmp-to-gnu-nersc' into next…
Browse files Browse the repository at this point in the history
… (PR #4910)

MPAS Standalone: Add OpenMP support to gnu-nersc

For some reason this was omitted when OpenMP support was added 8 years
ago. This has become a problem in compass because we switched to building
with OpenMP on by default: MPAS-Dev/compass#364
Does not impact E3SM builds.

[BFB]
  • Loading branch information
jonbob committed May 2, 2022
2 parents 71e7e83 + d4f7c0b commit 8b0a70c
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions components/mpas-framework/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,14 @@ gnu-nersc:
"CFLAGS_DEBUG = -g -m64" \
"CXXFLAGS_DEBUG = -g -m64" \
"LDFLAGS_DEBUG = -g -m64" \
"FFLAGS_OMP = -fopenmp" \
"CFLAGS_OMP = -fopenmp" \
"BUILD_TARGET = $(@)" \
"CORE = $(CORE)" \
"DEBUG = $(DEBUG)" \
"SERIAL = $(SERIAL)" \
"USE_PAPI = $(USE_PAPI)" \
"OPENMP = $(OPENMP)" \
"USE_SHTNS = $(USE_SHTNS)" \
"CPPFLAGS = $(MODEL_FORMULATION) -D_MPI $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )

Expand Down

0 comments on commit 8b0a70c

Please sign in to comment.