Skip to content

Fix for issue #43, adding support for second library path variable #44

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

Open
brianhigh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for issue #43, adding support for second library path variable #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Emissions/Fire/FINN/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

F90 = $(FC)
C_C = $(CC)
LIBS = -L$(NETCDF_DIR)/lib $(AR_FILES)
INCLUDE_MODULES = -I$(NETCDF_DIR)/include
LIBS = -L$(NETCDFC_DIR)/lib -L$(NETCDF_DIR)/lib $(AR_FILES)
INCLUDE_MODULES = -I$(NETCDFC_DIR)/include -I$(NETCDF_DIR)/include


ifeq ($(C_C),pgcc)
CCFLAGS += -g -O2 -Ktrap=fp
Expand Down
11 changes: 10 additions & 1 deletion Emissions/Fire/FINN/src/make_fire_emis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,16 @@ else
echo "============================================================================="
endif

set ar_libs = -lnetcdf
if( ! $?NETCDFC_DIR ) then
set NETCDFC_DIR = "$NETCDF_DIR"
endif

set ar_libs = ""

if( -e ${NETCDFC_DIR}/lib/libnetcdf.a ) then
set ar_libs = "-lnetcdf"
endif

if( -e ${NETCDF_DIR}/lib/libnetcdff.a ) then
set ar_libs = "${ar_libs} -lnetcdff"
endif
Expand Down