Changeset 1047 for trunk/LMDZ.MARS/libf/phymars/phyetat0.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/phyetat0.F (modified) (20 diffs)

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

@@ -1 @@
-      SUBROUTINE phyetat0 (fichnom,tab0,Lmodif,nsoil,nq,
+      SUBROUTINE phyetat0 (fichnom,tab0,Lmodif,nsoil,ngrid,nlay,nq,
      .           day_ini,time0,
      .           tsurf,tsoil,emis,q2,qsurf,co2ice)
@@ -5 +5 @@
       use netcdf
       use infotrac, only: nqtot, tnom
+      use surfdat_h, only: phisfi, albedodat, z0, z0_default,
+     &                     zmea, zstd, zsig, zgam, zthe
 
       implicit none
@@ -17 +19 @@
 c======================================================================
 !#include "netcdf.inc"
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 !#include "comgeomfi.h"
-#include "surfdat.h"
+!#include "surfdat.h"
 #include "planete.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 #include "comcstfi.h"
 !#include "tracer.h"
@@ -35 +37 @@
 !  ---------
 !  inputs:
-      character*(*) fichnom ! "startfi.nc" file
-      integer tab0
-      integer Lmodif
-      integer nsoil ! # of soil layers
-      integer nq
-      integer day_ini
-      real time0
+      character*(*),intent(in) :: fichnom ! "startfi.nc" file
+      integer,intent(in) :: tab0
+      integer,intent(in) :: Lmodif
+      integer,intent(in) :: nsoil ! # of soil layers
+      integer,intent(in) :: ngrid ! # of atmospheric columns
+      integer,intent(in) :: nlay ! # of atmospheric layers
+      integer,intent(in) :: nq
+      integer :: day_ini
+      real :: time0
 
 !  outputs:
-      real tsurf(ngridmx) ! surface temperature
-      real tsoil(ngridmx,nsoil) ! soil temperature
-      real emis(ngridmx) ! surface emissivity
-      real q2(ngridmx, llm+1) ! 
-      real qsurf(ngridmx,nq) ! tracers on surface
-      real co2ice(ngridmx) ! co2 ice cover
+      real,intent(out) :: tsurf(ngrid) ! surface temperature
+      real,intent(out) :: tsoil(ngrid,nsoil) ! soil temperature
+      real,intent(out) :: emis(ngrid) ! surface emissivity
+      real,intent(out) :: q2(ngrid,nlay+1) ! 
+      real,intent(out) :: qsurf(ngrid,nq) ! tracers on surface
+      real,intent(out) :: co2ice(ngrid) ! co2 ice cover
 
 !======================================================================
 !  Local variables:
 
-      real surffield(ngridmx) ! to temporarily store a surface field
+      real surffield(ngrid) ! to temporarily store a surface field
       real xmin,xmax ! to display min and max of a field
 c
@@ -248 +252 @@
          CALL abort
       ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      DO i = 1, ngridmx
-         xmin = MIN(zmea(i),xmin)
-         xmax = MAX(zmea(i),xmax)
-      ENDDO
+      xmin = MINVAL(zmea)
+      xmax = MAXVAL(zmea)
       PRINT*,'<zmea>:', xmin, xmax
 c
@@ -270 +270 @@
          CALL abort
       ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      DO i = 1, ngridmx
-         xmin = MIN(zstd(i),xmin)
-         xmax = MAX(zstd(i),xmax)
-      ENDDO
+      xmin = MINVAL(zstd)
+      xmax = MAXVAL(zstd)
       PRINT*,'<zstd>:', xmin, xmax
 c
@@ -292 +288 @@
          CALL abort
       ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      DO i = 1, ngridmx
-         xmin = MIN(zsig(i),xmin)
-         xmax = MAX(zsig(i),xmax)
-      ENDDO
+      xmin = MINVAL(zsig)
+      xmax = MAXVAL(zsig)
       PRINT*,'<zsig>:', xmin, xmax
 c
@@ -314 +306 @@
          CALL abort
       ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      DO i = 1, ngridmx
-         xmin = MIN(zgam(i),xmin)
-         xmax = MAX(zgam(i),xmax)
-      ENDDO
+      xmin = MINVAL(zgam)
+      xmax = MAXVAL(zgam)
       PRINT*,'<zgam>:', xmin, xmax
 c
@@ -336 +324 @@
          CALL abort
       ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      DO i = 1, ngridmx
-         xmin = MIN(zthe(i),xmin)
-         xmax = MAX(zthe(i),xmax)
-      ENDDO
+      xmin = MINVAL(zthe)
+      xmax = MAXVAL(zthe)
       PRINT*,'<zthe>:', xmin, xmax
       
@@ -417 +401 @@
       corner(1)=1
       corner(2)=indextime
-      edges(1)=ngridmx
+      edges(1)=ngrid
       edges(2)=1
       ierr=nf90_inq_varid(nid,"co2ice",nvarid)
@@ -486 +470 @@
 !         IF (nbsrf >= 2) THEN
 !            DO nsrf = 2, nbsrf
-!               DO i = 1, ngridmx
+!               DO i = 1, ngrid
 !                  tsurf(i,nsrf) = tsurf(i,1)
 !               ENDDO
@@ -506 +490 @@
 !               PRINT*, "phyetat0: Le champ <tsoil> est absent"
 !               PRINT*, "          Il prend donc la valeur de surface"
-!               DO i=1, ngridmx
+!               DO i=1, ngrid
 !                  tsoil(i,isoil,nsrf)=tsurf(i,nsrf)
 !               ENDDO
@@ -549 +533 @@
 
 !
-! surface roughness length (NB: z0 is a common in surfdat.h)
+! surface roughness length (NB: z0 is a common in surfdat_h)
 !
       ierr=nf90_inq_varid(nid,"z0",nvarid)
@@ -577 +561 @@
       corner(2)=1
       corner(3)=indextime
-      edges(1)=ngridmx
-      edges(2)=llm+1
+      edges(1)=ngrid
+      edges(2)=nlay+1
       edges(3)=1
       ierr=nf90_inq_varid(nid,"q2",nvarid)
@@ -602 +586 @@
       corner(1)=1
       corner(2)=indextime
-      edges(1)=ngridmx
+      edges(1)=ngrid
       edges(2)=1
       IF(nq.GE.1) THEN
@@ -628 +612 @@
      &                  ' not found in file'
              write(*,*) trim(txt), ' set to 0'
-             do ig=1,ngridmx
+             do ig=1,ngrid
                qsurf(ig,iq)=0.
              end do
@@ -635 +619 @@
            !ierr=nf90_get_var(nid,nvarid,qsurf(1,iq))
            ierr=nf90_get_var(nid,nvarid,surffield,corner,edges)
-           qsurf(1:ngridmx,iq)=surffield(1:ngridmx)
+           qsurf(1:ngrid,iq)=surffield(1:ngrid)
              IF (ierr.NE.nf90_noerr) THEN
                PRINT*, 'phyetat0: Lecture echouee pour <',trim(txt),'>'
@@ -644 +628 @@
            xmin = 1.0E+20
            xmax = -1.0E+20
-           xmin = MINVAL(qsurf(1:ngridmx,iq))
-           xmax = MAXVAL(qsurf(1:ngridmx,iq))
+           xmin = MINVAL(qsurf(1:ngrid,iq))
+           xmax = MAXVAL(qsurf(1:ngrid,iq))
            PRINT*,'tracer on surface <',trim(txt),'>:',xmin,xmax
          ENDDO
@@ -660 +644 @@
 !            if (yes.eq.'y') then
 !              write(*,*) 'OK, let s reindex qsurf'
-!                 do ig=1,ngridmx
+!                 do ig=1,ngrid
 !                    do iq=nqtot,nqtot-nqold+1,-1
 !                       qsurf(ig,iq)=qsurf(ig,iq-nqtot+nqold)
@@ -675 +659 @@
 ! as well as thermal inertia and volumetric heat capacity
 
-      call soil_settings(nid,ngridmx,nsoil,tsurf,tsoil,indextime)
+      call soil_settings(nid,ngrid,nsoil,tsurf,tsoil,indextime)
 c
 c Fermer le fichier: