Changeset 1165 in lmdz_wrf for trunk

Timestamp:

Oct 10, 2016, 11:03:03 AM (8 years ago)

Author:

lfita

Message:

Fixing compilation of the interpolation functions and Fortran routines

Location:

trunk/tools

Files:

• Makefile.ciclad.gcc (modified) (1 diff)
• nc_var_tools.py (modified) (1 diff)

trunk/tools/Makefile.ciclad.gcc

@@ -5 +5 @@
 # FOLLOWING: http://stackoverflow.com/questions/17156125/f2py-exposing-parameters-from-used-modules
 # FOLLOWING: http://osdir.com/ml/python.f2py.user/2006-08/msg00019.html
-# f2py -m module_ForDiag -h module_ForDiag.pyf module_generic.F90 module_ForDiagnosticsVars.F90 module_ForDiagnostics.F90 >& run_f2py_wrapper.log
+# module load python/2.7.6-canopy-1.3
+# 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 -L/opt/canopy-1.3.0/Canopy_64bit/System/lib/ -L/usr/lib64/ -L/opt/canopy-1.3.0/Canopy_64bit/System/lib/ -m module_ForDiag -c --fcompiler=gnu95 module_ForDiag.pyf module_generic.F90 module_ForDiagnosticsVars.F90 module_ForDiagnostics.F90 >& run_f2py_compile.log
+# f2py -L/opt/canopy-1.3.0/Canopy_64bit/System/lib/ -L/usr/lib64/ -L/opt/canopy-1.3.0/Canopy_64bit/System/lib/ -m module_ForDiag -c --fcompiler=gnu95 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 -L/opt/canopy-1.3.0/Canopy_64bit/System/lib/ -L/usr/lib64/ -L/opt/canopy-1.3.0/Canopy_64bit/System/lib/ -m module_ForInt -c --fcompiler=gnu95 module_ForInt.pyf module_generic.F90 module_ForInterpolate.F90  >& run_f2py_ForInt_compile.log
+#
 
 FC              = gfortran

trunk/tools/nc_var_tools.py

@@ -14879 +14879 @@
       varn= name of the variable
     """
-    import module_ForInterpolate as fin
+    import module_ForInt as fin
     import numpy.ma as ma
     import subprocess as sub