Changeset 1047 for trunk/LMDZ.MARS/libf/phymars/iniwritesoil.F90

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/iniwritesoil.F90 (modified) (5 diffs)

trunk/LMDZ.MARS/libf/phymars/iniwritesoil.F90

@@ -1 @@
-subroutine iniwritesoil(nid)
+subroutine iniwritesoil(nid,ngrid)
 
 ! initialization routine for 'writediagoil'. Here we create/define
@@ -5 +5 @@
 ! (time-independent) parameters.
 
+use comsoil_h, only: mlayer, inertiedat, nsoilmx
+
 implicit none
 
 #include"dimensions.h"
-#include"dimphys.h"
+!#include"dimphys.h"
 #include"paramet.h"
 #include"comcstfi.h"
 #include"comgeom.h"
-#include"comsoil.h"
+!#include"comsoil.h"
 #include"netcdf.inc"
 
 ! Arguments:
+integer,intent(in) :: ngrid
 integer,intent(in) :: nid ! NetCDF output file ID
 
@@ -154 +157 @@
 ierr=NF_PUT_VAR_REAL(nid,varid,mlayer)
 #endif
-! Note mlayer(0:nsoilmx-1) known from comsoil.h
+! Note mlayer(0:nsoilmx-1) known from comsoil_h
 if (ierr.ne.NF_NOERR) then
   write(*,*)"iniwritesoil: Error, could not write depth variable"
@@ -240 +243 @@
 
 ! Recast data along 'dynamics' grid
-! Note: inertiedat is known from comsoil.h
+! Note: inertiedat is known from comsoil_h
 
 do l=1,nsoilmx
@@ -246 +249 @@
   do i=1,iip1
     data3(i,1,l)=inertiedat(1,l)
-    data3(i,jjp1,l)=inertiedat(ngridmx,l)
+    data3(i,jjp1,l)=inertiedat(ngrid,l)
   enddo
   ! rest of the grid