Changeset 1047 for trunk/LMDZ.MARS/libf/dyn3d

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

Location:

trunk/LMDZ.MARS/libf/dyn3d

Files:

• ini_archive.F (modified) (2 diffs)
• lect_start_archive.F (modified) (14 diffs)
• lectflux.F (deleted)
• newstart.F (modified) (5 diffs)
• start2archive.F (modified) (5 diffs)
• write_archive.F (modified) (1 diff)

trunk/LMDZ.MARS/libf/dyn3d/ini_archive.F

@@ -34 +34 @@
 c=======================================================================
  
+      use comsoil_h, only: nsoilmx, mlayer
       implicit none
 
@@ -48 +49 @@
 #include "serre.h"
 #include "control.h"
-#include"comsoil.h"
+!#include"comsoil.h"
 
 #include "netcdf.inc"

trunk/LMDZ.MARS/libf/dyn3d/lect_start_archive.F

@@ -1 @@
-      SUBROUTINE lect_start_archive(nqtot,date,tsurf,tsoil,emis,q2,
+      SUBROUTINE lect_start_archive(ngrid,nlayer,nqtot,
+     &     date,tsurf,tsoil,emis,q2,
      &     t,ucov,vcov,ps,co2ice,h,phisold_newgrid,
      &     q,qsurf,surfith,nid)
@@ -17 +18 @@
 c=======================================================================
       use infotrac, only: tnom
+      use comsoil_h, only: nsoilmx, layer, mlayer, volcapa, inertiedat
       implicit none
 
 #include "dimensions.h"
-#include "dimphys.h"
-#include "surfdat.h"
-#include "comsoil.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "dimphys.h"
+!#include "surfdat.h"
+!#include "comsoil.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 #include "planete.h"
 #include "paramet.h"
@@ -49 +51 @@
 c et autres:
 c----------
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+                                  ! on new physics grid
+      integer,intent(in) :: nlayer ! number of atmospheric layers
+                                   ! on new grid
       integer,intent(in) :: nqtot ! number of advected tracers
 
@@ -98 +104 @@
 c variable physique
 c------------------
-      REAL tsurf(ngridmx) ! surface temperature
-      REAL tsoil(ngridmx,nsoilmx) ! soil temperature
-      REAL co2ice(ngridmx) ! CO2 ice layer
-      REAL emis(ngridmx)
-      REAL q2(ngridmx,nlayermx+1),qsurf(ngridmx,nqtot)
-c     REAL phisfi(ngridmx)
+      REAL tsurf(ngrid) ! surface temperature
+      REAL tsoil(ngrid,nsoilmx) ! soil temperature
+      REAL co2ice(ngrid) ! CO2 ice layer
+      REAL emis(ngrid)
+      REAL q2(ngrid,nlayer+1),qsurf(ngrid,nqtot)
+c     REAL phisfi(ngrid)
 
       INTEGER i,j,l
@@ -176 +182 @@
 
       real surfith(iip1,jjp1) ! surface thermal inertia
-!      real surfithfi(ngridmx)
+!      real surfithfi(ngrid)
       ! surface thermal inertia at old horizontal grid resolution
       real, dimension(:,:), allocatable :: surfithold 
@@ -335 +341 @@
       allocate(varp1 (imold+1,jmold+1,llm+1))
 
-      write(*,*) 'q2',ngridmx,nlayermx+1
+      write(*,*) 'q2',ngrid,nlayer+1
       write(*,*) 'q2S',iip1,jjp1,llm+1
       write(*,*) 'q2old',imold+1,jmold+1,lmold+1
@@ -1000 +1006 @@
       call interp_horiz (tsurfold,tsurfs,imold,jmold,iim,jjm,1,
      &                   rlonuold,rlatvold,rlonu,rlatv)
-      call gr_dyn_fi (1,iim+1,jjm+1,ngridmx,tsurfs,tsurf)
+      call gr_dyn_fi (1,iim+1,jjm+1,ngrid,tsurfs,tsurf)
 c     write(44,*) 'tsurf', tsurf
 
@@ -1007 +1013 @@
 !     &                  imold,jmold,iim,jjm,nsoilmx,
 !     &                   rlonuold,rlatvold,rlonu,rlatv)
-!      call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngridmx,tsoils,tsoil)
+!      call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngrid,tsoils,tsoil)
 c     write(45,*) 'tsoil',tsoil
 
@@ -1013 +1019 @@
       call interp_horiz (emisold,emiss,imold,jmold,iim,jjm,1,
      &                   rlonuold,rlatvold,rlonu,rlatv)
-      call gr_dyn_fi (1,iim+1,jjm+1,ngridmx,emiss,emis)
+      call gr_dyn_fi (1,iim+1,jjm+1,ngrid,emiss,emis)
 c     write(46,*) 'emis',emis
 c-----------------------------------------------------------------------
@@ -1130 +1136 @@
 
       ! Reshape inertiedatS to scalar grid as inertiedat
-      call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngridmx,
+      call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngrid,
      &                  inertiedatS,inertiedat)
       
@@ -1203 +1209 @@
 
       ! Reshape tsoilS to scalar grid as tsoil
-       call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngridmx,tsoilS,tsoil)
+       call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngrid,tsoilS,tsoil)
 
 
@@ -1229 +1235 @@
      &                   rlonuold,rlatvold,rlonu,rlatv)
       write (*,*) 'lect_start_archive: q2s ', q2s (1,2,1)  ! INFO
-      call gr_dyn_fi (llm+1,iim+1,jjm+1,ngridmx,q2s,q2)
+      call gr_dyn_fi (llm+1,iim+1,jjm+1,ngrid,q2s,q2)
       write (*,*) 'lect_start_archive: q2 ', q2 (1,2)  ! INFO
 c     write(47,*) 'q2',q2
@@ -1278 +1284 @@
       enddo
 
-      call gr_dyn_fi (nqtot,iim+1,jjm+1,ngridmx,qsurfs,qsurf)
+      call gr_dyn_fi (nqtot,iim+1,jjm+1,ngrid,qsurfs,qsurf)
 
 c traceurs 3D
@@ -1329 +1335 @@
       enddo
       
-      call gr_dyn_fi (1,iim+1,jjm+1,ngridmx,co2ices,co2ice)
+      call gr_dyn_fi (1,iim+1,jjm+1,ngrid,co2ices,co2ice)
 
 c-----------------------------------------------------------------------

trunk/LMDZ.MARS/libf/dyn3d/newstart.F

@@ -19 +19 @@
       use infotrac, only: iniadvtrac, nqtot, tnom
       use tracer_mod, only: noms, igcm_h2o_vap, igcm_h2o_ice
+      use surfdat_h, only: phisfi, z0, zmea, zstd, zsig, zgam, zthe,
+     &                     albedodat, z0_default
+      use comsoil_h, only: inertiedat, layer, mlayer, nsoilmx
       implicit none
 
 #include "dimensions.h"
+      integer, parameter :: ngridmx = (2+(jjm-1)*iim - 1/jjm) 
 #include "dimphys.h"
-#include "surfdat.h"
-#include "comsoil.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "surfdat.h"
+!#include "comsoil.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 #include "planete.h"
 #include "paramet.h"
@@ -404 +408 @@
 
         write(*,*) 'Reading file START_ARCHIVE'
-        CALL lect_start_archive(nqtot,date,tsurf,tsoil,emis,q2,
-     .   t,ucov,vcov,ps,co2ice,teta,phisold_newgrid,q,qsurf,
+        CALL lect_start_archive(ngridmx,llm,nqtot,
+     &   date,tsurf,tsoil,emis,q2,
+     &   t,ucov,vcov,ps,co2ice,teta,phisold_newgrid,q,qsurf,
      &   surfith,nid)
         write(*,*) "OK, read start_archive file"
@@ -425 +430 @@
         write(*,*) 'Reading file STARTFI'
         fichnom = 'startfi.nc'
-        CALL phyetat0 (fichnom,tab0,Lmodif,nsoilmx,nqtot,
+        CALL phyetat0 (fichnom,tab0,Lmodif,nsoilmx,ngridmx,llm,nqtot,
      .        day_ini,time,
      .        tsurf,tsoil,emis,q2,qsurf,co2ice)
@@ -858 +863 @@
           endif
           
-          call inichim_newstart(nq, q, qsurf, ps, flagh2o, flagthermo)
+          call inichim_newstart(ngridmx, nq, q, qsurf, ps, 
+     &                          flagh2o, flagthermo)
 
          ! We want to have the very same value at lon -180 and lon 180
@@ -1472 +1478 @@
 C
 
-      call physdem0("restartfi.nc",lonfi,latfi,nsoilmx,nqtot,
-     .              dtphys,real(day_ini),0.0,
+      call physdem0("restartfi.nc",lonfi,latfi,nsoilmx,ngridmx,llm,
+     .              nqtot,dtphys,real(day_ini),0.0,
      .              airefi,albfi,ithfi,zmea,zstd,zsig,zgam,zthe)
-      call physdem1("restartfi.nc",nsoilmx,nqtot,
+      call physdem1("restartfi.nc",nsoilmx,ngridmx,llm,nqtot,
      .              dtphys,hour_ini,
      .              tsurf,tsoil,co2ice,emis,q2,qsurf)

trunk/LMDZ.MARS/libf/dyn3d/start2archive.F

@@ -20 +20 @@
 
       use infotrac, only: iniadvtrac, nqtot, tnom
+      use comsoil_h, only: nsoilmx, inertiedat
+      use surfdat_h, only: ini_surfdat_h
+      use comsoil_h, only: ini_comsoil_h
       implicit none
 
 #include "dimensions.h"
+      integer, parameter :: ngridmx = (2+(jjm-1)*iim - 1/jjm) 
 #include "paramet.h"
 #include "comconst.h"
@@ -34 +38 @@
 #include "description.h"
 
-#include "dimphys.h"
-#include "comsoil.h"
+!#include "dimphys.h"
+!#include "comsoil.h"
 !#include"advtrac.h"
 #include "netcdf.inc"
@@ -62 +66 @@
       REAL tsoil(ngridmx,nsoilmx) ! Soil temperature
       REAL co2ice(ngridmx)      ! CO2 ice layer
-      REAL q2(ngridmx,nlayermx+1)
+      REAL q2(ngridmx,llm+1)
       REAL,ALLOCATABLE :: qsurf(:,:)
       REAL emis(ngridmx)
@@ -126 +130 @@
       allocate(qsurf(ngridmx,nqtot))
       allocate(qsurfS(ip1jmp1,nqtot))
+      call ini_surfdat_h(ngridmx)
+      call ini_comsoil_h(ngridmx)
+      
 
       fichnom = 'start.nc'
@@ -135 +142 @@
       Lmodif=0
 
-      CALL phyetat0 (fichnom,0,Lmodif,nsoilmx,nqtot,day_ini_fi,timefi,
-     .      tsurf,tsoil,emis,q2,qsurf,co2ice)
+      CALL phyetat0 (fichnom,0,Lmodif,nsoilmx,ngridmx,llm,nqtot,
+     &      day_ini_fi,timefi,tsurf,tsoil,emis,q2,qsurf,co2ice)
 
        ierr = NF_OPEN (fichnom, NF_NOWRITE,nid1)

trunk/LMDZ.MARS/libf/dyn3d/write_archive.F

@@ -32 +32 @@
 c=======================================================================
 
+      use comsoil_h, only: nsoilmx
       implicit none