Changeset 1245 for trunk

Timestamp:

May 11, 2014, 1:32:49 PM (11 years ago)

Author:

aslmd

Message:

LMDZ.COMMON. added support for gfortran. corrected cyclic dependency with moyzon.

Location:

trunk/LMDZ.COMMON

Files:

• arch/arch-gfortran.fcm (added)
• arch/arch-gfortran.path (added)
• ioipsl/install_ioipsl_gfortran.bash (moved) (moved from trunk/LMDZ.COMMON/ioipsl/install_ioipsl_gfortan.bash) (1 diff)
• libf/dyn3d/calfis.F (modified) (1 diff)
• libf/dyn3d/moyzon_mod.F90 (modified) (2 diffs)

trunk/LMDZ.COMMON/ioipsl/install_ioipsl_gfortran.bash

@@ -5 +5 @@
 # below to adapt this script to your computer.
 
+setfolder="/home/aymeric/Science/MODELES/LMDZ.COMMON/netcdf/gfortran_netcdf-4.0.1"
+#setfolder="/donnees/emlmd/netcdf64-4.0.1_gfortran/"
+
 #0. Preliminary stuff 
 # netcdf include and lib dirs:
-netcdf_include="/donnees/emlmd/netcdf64-4.0.1_gfortran/include"
-netcdf_lib="/donnees/emlmd/netcdf64-4.0.1_gfortran/lib"
+netcdf_include=$setfolder"/include"
+netcdf_lib=$setfolder"/lib"
 
 whereami=`pwd -P`

trunk/LMDZ.COMMON/libf/dyn3d/calfis.F

@@ -224 +224 @@
         endif
 
-        if (flag_moyzon) call moyzon_init
+        if (flag_moyzon) call moyzon_init(iim,llm,nqtot)
 
 c----------------------------------------------

trunk/LMDZ.COMMON/libf/dyn3d/moyzon_mod.F90

@@ -24 +24 @@
 CONTAINS
 !======================================================================
-SUBROUTINE moyzon_init
+SUBROUTINE moyzon_init(klon,llm,nqtot)
 #ifdef CPP_PHYS
-! This routine needs physics
-USE dimphy
-USE infotrac, only: nqtot
+!! This routine needs physics
 IMPLICIT NONE
-    INCLUDE "dimensions.h"
+       INTEGER :: klon,llm,nqtot
 
       ALLOCATE(zplevbar(klon,llm+1),zplaybar(klon,llm))
@@ -37 +35 @@
       ALLOCATE(zpkbar(klon,llm),ztetabar(klon,llm))
       ALLOCATE(zzlevbar(klon,llm+1),zzlaybar(klon,llm))
-
 #else
     include "iniprint.h"