Changeset 73 for trunk/mesoscale/LMD_MM_MARS/SRC/PREP_MARS

Timestamp:

Feb 20, 2011, 12:20:51 PM (14 years ago)

Author:

aslmd

Message:

LMD_MM_MARS: corrections cycle de l'eau propagees a la nouvelle physique. + corrections readmeteo.F90 [version synchronisee precedemment n etait pas la plus a jour] + corrections api.F90 pour avoir cp, R comme GCM

File:

• trunk/mesoscale/LMD_MM_MARS/SRC/PREP_MARS/readmeteo.F90 (modified) (8 diffs)

trunk/mesoscale/LMD_MM_MARS/SRC/PREP_MARS/readmeteo.F90

@@ -74 +74 @@
 !! Intermediate data arrays
 integer :: k,l,m,n,p
-real, dimension(:), allocatable :: lat,lon,time,alt,aps,bps,levels,dsoilvert
+real, dimension(:), allocatable :: lat,lon,time,alt,aps,bps,levels,vertdsoil
 real, dimension(:,:), allocatable :: vide,ones,ghtsfile
 real, dimension(:,:), allocatable :: interm
@@ -207 +207 @@
 allocate(dsoilfile(lonlen,latlen,altlen,timelen))
 allocate(isoilfile(lonlen,latlen,altlen,timelen))
-allocate(dsoilvert(altlen))
+allocate(vertdsoil(altlen))
 !allocate(tfileorig(lonlen,latlen,altlen,timelen))
 allocate(ufile(lonlen,latlen,altlen,timelen))
@@ -240 +240 @@
 isoilfile(:,:,:,:)=0 
 dsoilfile(:,:,:,:)=0 
-dsoilvert(:)=0.
+vertdsoil(:)=0.
 !tfileorig(:,:,:,:)=0
 !ufileorig(:,:,:,:)=0
@@ -591 +591 @@
 
     print *,'Surface Water ice'
-    ierr=NF_INQ_VARID(nid,"qsurf01",nvarid)
+!!!!!! ATTENTION ATTENTION 
+!!!!!! water ice a la surface est qsurf(ig,nqmx)
+    ierr=NF_INQ_VARID(nid,"qsurf02",nvarid)
     if (ierr.ne.NF_NOERR) then
-      write(*,*) "...No qsurf01 - surface Water ice set to 0"
+      write(*,*) "...No qsurf02 - surface Water ice set to 0"
       swatericefile(:,:,:)=0.
     else
@@ -648 +650 @@
         write(*,*) "...No soildepth - Set to -999"  !!! see soil_settings in LMD physics
         DO l=1,altlen
-                dsoilvert(l)=-999.
+                vertdsoil(l)=-999.
         ENDDO
     else
-        ierr=NF_GET_VAR_REAL(nid,nvarid,dsoilvert)
+        ierr=NF_GET_VAR_REAL(nid,nvarid,vertdsoil)
     endif
     print *, 'wait a minute' !! AS: I know this could be better
@@ -657 +659 @@
      DO n=1,latlen
       DO p=1,timelen
-       dsoilfile(m,n,:,p) = dsoilvert(:) 
+       dsoilfile(m,n,:,p) = vertdsoil(:) 
       ENDDO
      ENDDO
@@ -1050 +1052 @@
 !------------------------! 
 FIELD='SM100200'
-UNITS='kg/kg'
+UNITS='kg/m2'
 DESC='Surf water ice'
 XLVL=200100.
@@ -1470 +1472 @@
 deallocate(isoilfile)
 deallocate(dsoilfile)
-!deallocate(dsoilvert)
 !deallocate(tfileorig)
 deallocate(ufile)