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

Timestamp:

Aug 21, 2019, 7:19:43 PM (5 years ago)

Author:

pesei <petra seibert -@…>

Branches:

master, ctbto, dev

Children:

5b5589b

Parents:

8c55c02

Message:

changes in the Fortran part and associated regression test

2019-08-21 PS
introduce the "new" versions of source files:

all .f90 free format
code beautification
regression test is OK

make new local gfortran makefiles, remove parameters not needed
anymore

change filenames rwgrib.f90 (all lower), preconvert to calc_etadot,
adapt messages and comments in calc_etadot.f90
adapt all makefiles to new filenames
adapt success message of logfiles in regression test references
redo regression test OK

provide softlinks for standards:

calc_etadot.out -> calc_etadot_fast.out
makefile_local_gfortran -> makefile_fast

provide changelog.txt in Fortran
provide readme.txt in Regression/FortranEtadot?

File:

• Source/Fortran/makefile_fast (modified) (1 diff)

Source/Fortran/makefile_fast

@@ -2 +2 @@
 #
 # Makefile for flex_extract, Fortran code to calculate etadot
+# Makefile created using by mkmf 19.3.0
 #
 # Copyright: Leopold Haimberger, Petra Seibert
 # SPDX-License-Identifier: GPL-2.0 
 # 
-# Version for a machine with grib_api installed on standard paths
-# compiled for fast runs
+# Version for a machine with grib_api and emoslib installed on standard paths
+# full debugging
 #
 ###############################################################################
 
 
-GRIB_API_INCLUDE_DIR=/usr/include
-GRIB_API_LIB=  -Bstatic  -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic  -lm  -ljasper
-EMOSLIB=-lemosR64
-
-LIB     =  $(GRIB_API_LIB) $(EMOSLIB)
-
-F90 = gfortran -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore -ffixed-line-length-132 -fopenmp -fconvert=big-endian
-
-F90FLAGS =  -I. -I$(GRIB_API_INCLUDE_DIR)
-
-OPT = -O3
-
-BINDIR   =  .
 EXE      =  calc_etadot_fast.out
 
-.f.o:
-        $(F90) -c $(F90FLAGS) $(OPT) $*.f
-.f90.o:
-        $(F90) -c $(F90FLAGS) $(OPT) $*.f90
+GRIB_API_LIB=  -Bstatic -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper
+EMOSLIB=-lemosR64
+LIB =  $(GRIB_API_LIB) $(EMOSLIB)
 
-all:    ${EXE}
+GRIB_API_INCLUDE_DIR=/usr/include
+INC = -I. -I$(GRIB_API_INCLUDE_DIR)
 
-clean:
-        rm *.o *.mod #${EXE}
+FC = gfortran 
+OPT = -O3 -march=native
+FFLAGS =   $(OPT) $(LIB) $(INC) -fdefault-real-8 -fopenmp -fconvert=big-endian 
+LDFLAGS =  $(OPT) $(LIB) -fopenmp
+SRC = ./rwgrib2.f90 ./calc_etadot.f90 ./ftrafo.f90 ./grphreal.f90 ./posnam.f90 ./phgrreal.f90
+OBJ = rwgrib2.o calc_etadot.o ftrafo.o grphreal.o posnam.o phgrreal.o
+MOD = ftrafo.mod  grtoph.mod    phtogr.mod  rwgrib2.mod
 
-preconvert.o: preconvert.f90
-        $(F90) -c $(OPT) $(F90FLAGS) preconvert.f90
-        
-phgrreal.o: phgrreal.f
-        $(F90) -c $(OPT)   phgrreal.f
+.DEFAULT:
+        -echo $@ does not exist.
 
-rwGRIB2.o: rwGRIB2.f90
-        $(F90) -c $(OPT) $(F90FLAGS)  rwGRIB2.f90
+all: ${EXE}
+ftrafo.o: ./ftrafo.f90 phgrreal.o
+        $(FC)  $(FFLAGS)  -c    ./ftrafo.f90
+grphreal.o: ./grphreal.f90 phgrreal.o
+        $(FC)  $(FFLAGS)  -c    ./grphreal.f90
+phgrreal.o: ./phgrreal.f90
+        $(FC)  $(FFLAGS)  -c    ./phgrreal.f90
+posnam.o: ./posnam.f90
+        $(FC)  $(FFLAGS)  -c    ./posnam.f90
+calc_etadot.o: ./calc_etadot.f90 phgrreal.o grphreal.o ftrafo.o rwgrib2.o
+        $(FC)  $(FFLAGS)  -c    ./calc_etadot.f90
+rwgrib2.o: ./rwgrib2.f90
+        $(FC)  $(FFLAGS)  -c    ./rwgrib2.f90
 
-grphreal.o: grphreal.f
-        $(F90) -c $(OPT)   grphreal.f
+clean: 
+        -rm -f $(OBJ) ${EXE} $(MOD)
 
-ftrafo.o: ftrafo.f
-        $(F90) -c $(OPT)   ftrafo.f
-
-$(BINDIR)/${EXE}:       phgrreal.o grphreal.o ftrafo.o rwGRIB2.o  posnam.o preconvert.o
-        $(F90) $(OPT) -o $(BINDIR)/${EXE} ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o ${LIB}
-
-
-###############################################################################
-#
-# End of the Makefile
-#
-###############################################################################
+${EXE}: $(OBJ)
+        $(FC) $(OBJ) -o ${EXE}  $(LDFLAGS)