Changeset da1b788 in flex_extract.git for Source/Fortran/makefile_fast

Timestamp:

Mar 6, 2020, 1:34:52 PM (4 years ago)

Author:

anphi <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

5868d74

Parents:

f7b9666 (diff), 4d68c4a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'feature/makefiles' into dev

Solved merge conflict in makefile_fast and corrected executable name and LIB var name to eccodes

File:

• Source/Fortran/makefile_fast (modified) (2 diffs)

Source/Fortran/makefile_fast

@@ -7 +7 @@
 # SPDX-License-Identifier: GPL-2.0 
 # 
-# Version for a machine with grib_api and emoslib installed on standard paths
-# full debugging
+# Version for a machine with eccodes and emoslib installed on standard paths
+# with optimisation
 #
 ###############################################################################
 
 
-EXE      =  calc_etadot
+EXE      =  calc_etadot_fast.out
 
-#GRIB_API_LIB=  -Bstatic -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper
-ECCODES_LIB= -L/usr/local/lib -leccodes_f90 -leccodes -lm
+ECCODES_LIB =  -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper
 EMOSLIB=-lemosR64
 LIB =  $(ECCODES_LIB) $(EMOSLIB)
 
-ECCODES_INCLUDE_DIR=/usr/local/include
+ECCODES_INCLUDE_DIR=/usr/lib/x86_64-linux-gnu/fortran/gfortran-mod-15
 INC = -I. -I$(ECCODES_INCLUDE_DIR)
 
@@ -49 +48 @@
 
 clean: 
-        -rm -f $(OBJ) ${EXE} $(MOD)
+        -rm -f $(OBJ) ${EXE} $(MOD) calc_etadot
 
 ${EXE}: $(OBJ)
         $(FC) $(OBJ) -o ${EXE}  $(LDFLAGS)
+        ln -sf ${EXE} calc_etadot