From add9bb71b552a674ef30b190730c1110ee7e0905 Mon Sep 17 00:00:00 2001 From: Brian High Date: Wed, 18 May 2022 15:35:19 -0700 Subject: [PATCH] Fix for issue #43, adding support for second library path variable --- Emissions/Fire/FINN/src/Makefile | 5 +++-- Emissions/Fire/FINN/src/make_fire_emis | 11 ++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Emissions/Fire/FINN/src/Makefile b/Emissions/Fire/FINN/src/Makefile index 895779f..47efcf6 100644 --- a/Emissions/Fire/FINN/src/Makefile +++ b/Emissions/Fire/FINN/src/Makefile @@ -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 diff --git a/Emissions/Fire/FINN/src/make_fire_emis b/Emissions/Fire/FINN/src/make_fire_emis index 0281ccb..7b8c14b 100755 --- a/Emissions/Fire/FINN/src/make_fire_emis +++ b/Emissions/Fire/FINN/src/make_fire_emis @@ -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