Skip to content

Commit

Permalink
Merge pull request ESMCI#2951 from ESMCI/fischer/cosp_fix
Browse files Browse the repository at this point in the history
Fix nag & pgi CAM COSP build
The nag and pgi compilers were failing to include the COSP modules. The Makefile was updated to
add the include path to COSP, as needed.

Test suite: scripts_regression_tests, SMS_Ln9.f10_f10_mg37.F2000climo.hobart_intel.cam-cosp
SMS_Ln9.f10_f10_mg37.F2000climo.hobart_nag.cam-cosp
SMS_Ln9.f10_f10_mg37.F2000climo.hobart_pgi.cam-cosp
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes [CIME Github issue #]

User interface changes?:

Update gh-pages html (Y/N)?:

Code review: jedwards
  • Loading branch information
jedwards4b authored Dec 14, 2018
2 parents 27d9f2f + 12eb625 commit 5e2af84
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions scripts/Tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -483,8 +483,11 @@ FFLAGS_NOOPT += $(FPPDEFS)


ifeq ($(findstring -cosp,$(CAM_CONFIG_OPTS)),-cosp)
# The following is for the COSP simulator code:
COSP_LIBDIR:=$(abspath $(EXEROOT)/atm/obj/cosp)
# The following is for the COSP simulator code:
COSP_LIBDIR:=$(abspath $(EXEROOT)/atm/obj/cosp)
ifeq ($(MODEL),driver)
INCLDIR+=-I$(COSP_LIBDIR)
endif
endif

ifeq ($(MODEL),cam)
Expand Down

0 comments on commit 5e2af84

Please sign in to comment.