Changeset 1047 for trunk/LMDZ.MARS/libf/phymars/soil_settings.F

Timestamp:

Sep 23, 2013, 9:56:47 AM (11 years ago)

Author:

emillour

Message:

Mars GCM:

• IMPORTANT CHANGE: Removed all reference/use of ngridmx (dimphys.h) in routines (necessary prerequisite to using parallel dynamics); in most cases this just means adding 'ngrid' as routine argument, and making local saved variables allocatable (and allocated at first call). In the process, had to convert many *.h files to equivalent modules: yomaer.h => yomaer_h.F90 , surfdat.h => surfdat_h.F90 , comsaison.h => comsaison_h.F90 , yomlw.h => yomlw_h.F90 , comdiurn.h => comdiurn_h.F90 , dimradmars.h => dimradmars_mod.F90 , comgeomfi.h => comgeomfi_h.F90, comsoil.h => comsoil_h.F90 , slope.h => slope_mod.F90
• Also updated EOF routines, everything is now in eofdump_mod.F90
• Removed unused routine lectfux.F (in dyn3d)

EM

File:

• trunk/LMDZ.MARS/libf/phymars/soil_settings.F (modified) (5 diffs)

trunk/LMDZ.MARS/libf/phymars/soil_settings.F

@@ -2 +2 @@
 
       use netcdf
+      use comsoil_h, only: layer, mlayer, inertiedat, volcapa
       implicit none
 
@@ -31 +32 @@
 !======================================================================
 
-#include "dimensions.h"
-#include "dimphys.h"
-
-#include "comsoil.h"
-!#include "netcdf.inc"
 !======================================================================
 !  arguments
 !  ---------
 !  inputs:
-      integer nid       ! Input Netcdf file ID 
-      integer ngrid     ! # of horizontal grid points
-      integer nsoil     ! # of soil layers
-      real tsurf(ngrid) ! surface temperature
-      integer indextime ! position on time axis
+      integer,intent(in) :: nid ! Input Netcdf file ID 
+      integer,intent(in) :: ngrid       ! # of horizontal grid points
+      integer,intent(in) :: nsoil       ! # of soil layers
+      real,intent(in) :: tsurf(ngrid)   ! surface temperature
+      integer,intent(in) :: indextime   ! position on time axis
 !  output:
-      real tsoil(ngridmx,nsoilmx)       ! soil temperature
+      real,intent(out) :: tsoil(ngrid,nsoil)    ! soil temperature
 
 !======================================================================
@@ -184 +180 @@
       enddo
 
-! 2. Volumetric heat capacity (note: it is declared in comsoil.h)
+! 2. Volumetric heat capacity (note: it is declared in comsoil_h)
 ! ---------------------------
 ! "volcapa" is (so far) 0D and written in "controle" table of startfi file 
@@ -217 +213 @@
 !      endif
 
-! 3. Thermal inertia (note: it is declared in comsoil.h)
+! 3. Thermal inertia (note: it is declared in comsoil_h)
 ! ------------------
 
@@ -306 +302 @@
         corner(2)=1
         corner(3)=indextime
-        edges(1)=ngridmx
-        edges(2)=nsoilmx
+        edges(1)=ngrid
+        edges(2)=nsoil
         edges(3)=1
         !ierr=nf90_get_var(nid,nvarid,tsoil,corner,edges)