Changeset 1771 in lmdz_wrf for trunk/tools

Timestamp:

Feb 9, 2018, 7:03:40 PM (7 years ago)

Author:

lfita

Message:

Updating `rayo' compilation
Removing spurious tests

Location:

trunk/tools

Files:

• Makefile.rayo (modified) (8 diffs)
• generic_tools.py (modified) (1 diff)

trunk/tools/Makefile.rayo

@@ -1 @@
-# L. Fita, CIMA. September 2017
+# L. Fita, LMD. February 2018
 # Compilation of all required Fortran modules in `rayo' (debian 9) with gcc compilers
 # A following python 'library' creation is required
-# Diagnostics compilation _______
-# f2py -m module_ForDiag -h module_ForDiag.pyf module_generic.f90 module_ForDiagnosticsVars.f90 module_ForDiagnostics.f90 >& run_f2py_ForDiag_wrapper.log
-# make
-# f2py -m module_ForDiag -c --f90exec=/usr/bin/gfortran-6 module_ForDiag.pyf module_generic.f90 module_ForDiagnosticsVars.f90 module_ForDiagnostics.f90 >& run_f2py_ForDiag_compile.log
-# Interpolation compilation _______
-# f2py -m module_ForInt -h module_ForInt.pyf module_generic.f90 module_ForInterpolate.f90  >& run_f2py_ForInt_wrapper.log
-# f2py -m module_ForInt -c --f90exec=/usr/bin/gfortran-6 module_ForInt.pyf module_generic.f90 module_ForInterpolate.f90  >& run_f2py_ForInt_compile.log
+## Compilation
+# make >& run_make.log
 
 FC              = gfortran
@@ -14 +9 @@
 LIB_INC = 
 RM              = rm -f
-#DBGFLAGS = -g -Wall -Wextra -Warray-temporaries -Wconversion -fimplicit-none -fbacktrace -ffree-line-length-0 -fcheck=all -ffpe-trap=zero,overflow,underflow -finit-real=nan
+F2PY    = /usr/bin/f2py
+DBGFLAGS = -g -Wall -Wextra -Warray-temporaries -Wconversion -fimplicit-none -fbacktrace -ffree-line-length-0 -fcheck=all -ffpe-trap=zero,overflow,underflow -finit-real=nan
 NCLIBFOLD       = /usr/lib/x86_64-linux-gnu
 NCINCFOLD       = /usr/include
@@ -27 +23 @@
 intsrcs = $(srcs) module_ForInterpolate.f90
 scisrcs = $(srcs)
+defsrcs = module_definitions.f90
 
 ####### ###### ##### #### ### ## #
@@ -34 +31 @@
         module_basic.o \
         module_generic.o \
+        module_NCgeneric.o \
         module_scientific.o \
         module_ForDiagnosticsVars.o \
@@ -47 +45 @@
         pyintmods.o \
         pyscimods.o \
+        pydefmods.o \
         trajectories_overlap.o
 
@@ -53 +52 @@
 
 clean :
-        $(RM) *.mod *.o interpolate module_ForDiag.so module_ForInt.so module_ForDistriCorrect.so module_ForSci.so
+        $(RM) *.mod *.o interpolate module_ForDiag.so module_ForInt.so module_ForDistriCorrect.so module_ForSci.so module_ForDef.so
 
 ########    #######
@@ -66 +65 @@
 
 module_generic.o: module_definitions.o module_basic.o
-        $(FC) $(FCFLAGS) $(LIB_NETCDF) $(LIB_INC) module_generic.f90
+        $(FC) $(FCFLAGS) $(LIB_INC) module_generic.f90
+
+module_NCgeneric.o: module_definitions.o module_basic.o module_generic.o
+        $(FC) $(FCFLAGS) $(LIB_NETCDF) $(LIB_INC) module_NCgeneric.f90
 
 module_scientific.o: module_definitions.o module_basic.o module_generic.o
-        $(FC) $(FCFLAGS) $(LIB_NETCDF) module_scientific.f90
+        $(FC) $(FCFLAGS) module_scientific.f90
 
 module_ForDiagnosticsVars.o: module_definitions.o module_basic.o module_generic.o
-        $(FC) $(FCFLAGS) $(LIB_NETCDF) $(LIB_INC) module_ForDiagnosticsVars.f90
+        $(FC) $(FCFLAGS) $(LIB_INC) module_ForDiagnosticsVars.f90
 
 module_ForDiagnostics.o: module_definitions.o module_basic.o module_generic.o module_ForDiagnosticsVars.o
-        $(FC) $(FCFLAGS) $(LIB_NETCDF) $(LIB_INC) module_ForDiagnostics.f90
+        $(FC) $(FCFLAGS) $(LIB_INC) module_ForDiagnostics.f90
 
 module_DistriCorrection.o: module_definitions.o module_basic.o module_generic.o module_scientific.o
-        $(FC) $(FCFLAGS) $(LIB_NETCDF) module_DistriCorrection.f90
+        $(FC) $(FCFLAGS) module_DistriCorrection.f90
 
 FCEXECFLAGS = $(MODULES) $(LIB_NETCDF) $(LIB_INC)
@@ -85 +87 @@
         $(FC) $(FCEXECFLAGS) interpolate.f90 -o interpolate
 
-DistriCorrection.o: module_definitions.o module_basic.o module_generic.o module_scientific.o module_DistriCorrection.o
+DistriCorrection.o: module_definitions.o module_basic.o module_generic.o module_NCgeneric.o module_scientific.o module_DistriCorrection.o
         $(FC) $(FCEXECFLAGS) DistriCorrection.f90 -o DistriCorrection
 
 pydistrimods.o:
-        f2py -c -I$(NCINCFOLD) -m module_ForDistriCorrect $(distrisrcs) -L$(NCLIBFOLD)
+        $(F2PY) -c -I$(NCINCFOLD) -m module_ForDistriCorrect $(distrisrcs) -L$(NCLIBFOLD)
 
 pydiagmods.o:
-        f2py -c -I$(NCINCFOLD) -m module_ForDiag $(diagsrcs) -L$(NCLIBFOLD)
+        $(F2PY) -c -I$(NCINCFOLD) -m module_ForDiag $(diagsrcs) -L$(NCLIBFOLD)
 
 pyintmods.o:
-        f2py -c -I$(NCINCFOLD) -m module_ForInt $(intsrcs) -L$(NCLIBFOLD)
+        $(F2PY) -c -I$(NCINCFOLD) -m module_ForInt $(intsrcs) -L$(NCLIBFOLD)
 
 pyscimods.o:
-        f2py -c -I$(NCINCFOLD) -m module_ForSci $(scisrcs) -L$(NCLIBFOLD)
+        $(F2PY) -c -I$(NCINCFOLD) -m module_ForSci $(scisrcs) -L$(NCLIBFOLD)
 
-trajectories_overlap.o: module_definitions.o module_basic.o module_generic.o module_scientific.o
+pydefmods.o:
+        $(F2PY) -c -I$(NCINCFOLD) -m module_ForDef $(defsrcs) -L$(NCLIBFOLD)
+
+trajectories_overlap.o: module_definitions.o module_basic.o module_generic.o module_NCgeneric.o module_scientific.o
         $(FC) $(FCEXECFLAGS) trajectories_overlap.f90 -o trajectories_overlap
 

trunk/tools/generic_tools.py

@@ -12648 +12648 @@
        return angle
 
-d, m, s = angle_DegMinSec(-23.0025)
-print d, m, s
-print DegMinSec_angle(d,m,s)
-
 #quit()