Commit dd418859 authored by Knut's avatar Knut

some bug-fixes for compilation

parent 89524b80
......@@ -113,6 +113,7 @@ ifdef GOTM_PREFIX
GOTMLIBDIR = $(GOTM_PREFIX)/lib
LINKDIRS += -L$(GOTMLIBDIR)
EXTRA_LIBS += -loutput_manager
ifeq ($(FABM),true)
EXTRA_LIBS += -lgotm_fabm
endif
......
......@@ -18,12 +18,17 @@ find_library(GOTM_TURBULENCE NAMES turbulence
HINTS ${GOTM_PREFIX}/lib
DOC "GOTM turbulence library")
# Find GOTM output_manager library
find_library(GOTM_OUTMAN NAMES output_manager
HINTS ${GOTM_PREFIX}/lib
DOC "GOTM output_manager library")
# Find GOTM utility library
find_library(GOTM_UTIL NAMES util
HINTS ${GOTM_PREFIX}/lib
DOC "GOTM utility library")
set(GOTM_LIBRARIES ${GOTM_FABM} ${GOTM_TURBULENCE} ${GOTM_UTIL})
set(GOTM_LIBRARIES ${GOTM_FABM} ${GOTM_TURBULENCE} ${GOTM_OUTMAN} ${GOTM_UTIL})
# Store configurable path of GOTM include directory
find_path(GOTM_INCLUDE_DIRS
......@@ -32,7 +37,7 @@ find_path(GOTM_INCLUDE_DIRS
DOC "GOTM include directories"
)
mark_as_advanced(GOTM_LIBRARIES GOTM_INCLUDE_DIRS GOTM_TURBULENCE GOTM_UTIL GOTM_FABM)
mark_as_advanced(GOTM_LIBRARIES GOTM_INCLUDE_DIRS GOTM_TURBULENCE GOTM_OUTMAN GOTM_UTIL GOTM_FABM)
# Process default arguments (QUIET, REQUIRED)
include(FindPackageHandleStandardArgs)
......
......@@ -10,6 +10,7 @@ SRC = main.F90 initialise.F90 integration.F90 cleanup.F90 \
compilation_options.F90 print_version.F90
MOD = \
${LIB}(register_all_variables.o) \
${LIB}(integration.o) \
${LIB}(initialise.o)
......@@ -29,7 +30,7 @@ doc: $(SRC)
touch doc
clean:
$(RM) ${LIB} $(MODDIR)/{integration,initialise}.{m.mod}
$(RM) ${LIB} $(MODDIR)/{register_all_variables,integration,initialise}.{m.mod}
realclean: clean
$(RM) *.o doc
......
......@@ -6,7 +6,7 @@ include ../Rules.make
LIB = $(LIBDIR)/liboutput${buildtype}.a
MODSRC = output.F90 parser.F90 variable_info.F90 \
MODSRC = output.F90 output_processing.F90 \
ncdf_out.F90 ascii_out.F90 \
diagnostic_variables.F90 nesting.F90
......@@ -23,11 +23,9 @@ endif
MOD += \
${LIB}(ncdf_out.o) \
${LIB}(ascii_out.o) \
${LIB}(output_processing.o) \
${LIB}(output.o)
#$(LIB)(variable_info.o) \
#$(LIB)(parser.o) \
OBJ =
ifneq ($(GETM_NO_3D),true)
OBJ += \
......@@ -42,24 +40,12 @@ modules: $(MOD)
objects: $(OBJ)
tests: test_parser test_varinfo
test_parser: modules objects test_parser.o
$(FC) -o $@ $@.o $(LDFLAGS) $(LIB)
$(RM) $@.o
./$@
test_varinfo: modules objects test_varinfo.o
$(FC) -o $@ $@.o $(LDFLAGS) $(LIB)
$(RM) $@.o
./$@
doc: $(SRC)
$(PROTEX) $(SRC) > $(DOCDIR)/output.tex
touch doc
clean:
$(RM) $(LIB) $(MODDIR)/{output,ncdf_out,ascii_out}.{m,mod}
$(RM) $(LIB) $(MODDIR)/{output,output_processing,ncdf_out,ascii_out}.{m,mod}
realclean: clean
$(RM) *.o doc
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment