Changeset 1112

Timestamp:

Nov 20, 2013, 10:26:12 AM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS. a few remaining ngridmx in comments. MESOSCALE. prep work for no-longer-fixed ngridmx. for mesoscale+newphys runs please use r1045 of LMDZ.MARS because more recent versions will require adaptations.

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• dimphys.h (modified) (1 diff)
• dimradmars_mod.F90 (modified) (1 diff)
• inifis.F (modified) (6 diffs)
• meso_inc/meso_dimphys.h_ref (modified) (1 diff)
• meso_inc/meso_inc_caps.F (modified) (2 diffs)
• meso_inc/meso_inc_ini.F (modified) (5 diffs)
• meso_inc/meso_inc_var.F (modified) (2 diffs)
• physiq.F (modified) (1 diff)
• tabfi.F (modified) (2 diffs)
• testphys1d.F (modified) (1 diff)

trunk/LMDZ.MARS/libf/phymars/dimphys.h

@@ -2 +2 @@
 !   INCLUDE 'dimphys.h'
 
-! ngridmx : number of horizontal grid points
-! note: the -1/jjm term will be 0; unless jj=1
-!      integer, parameter :: ngridmx = (2+(jjm-1)*iim - 1/jjm)   
+!!! -- no longer used. just kept for reference
+!!! ngridmx : number of horizontal grid points
+!!! note: the -1/jjm term will be 0; unless jj=1
+!!!      integer, parameter :: ngridmx = (2+(jjm-1)*iim - 1/jjm)   
 ! nlayermx : number of atmospheric layers
       integer, parameter :: nlayermx = llm 

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

@@ -7 +7 @@
   ! Splitting of horizontal grid
   ! NDLO2 and ndomainsz for the splitting in the physics call
-  ! WARNING:  One must have  1 < ndomainsz =< ngridmx
+  ! WARNING:  One must have  1 < ndomainsz =< ngrid
   integer,save :: NFLEV !=nlayermx   ! with splitting
-  integer,save :: ndomainsz !=(ngridmx-1)/20 + 1
+  integer,save :: ndomainsz !=(ngrid-1)/20 + 1
   integer,save :: NDLON !=ndomainsz  ! with splitting
   integer,save :: NDLO2 !=NDLON

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

@@ -49 +49 @@
       use tracer_mod, only : nqmx, nuice_sed, ccn_factor
       use comsoil_h, only: ini_comsoil_h
-#ifdef MESOSCALE
-      use comsoil_h, only: volcapa !!MESOSCALE -- needed to fill volcapa
-#endif      
       use comgeomfi_h, only: long, lati, area, totarea
       use comdiurn_h, only: sinlat, coslat, sinlon, coslon
@@ -62 +59 @@
       use yomlw_h, only: ini_yomlw_h
       use conc_mod, only: ini_conc_mod
+
+#ifdef MESOSCALE
+      !! see meso_inc_inifisini.F 
+      use surfdat_h, only: emissiv,albedice,iceradius,
+     &                     emisice,dtemisice,
+     &                     z0_default,z0,
+     &                     albedodat,phisfi,
+     &                     zmea,zstd,zsig,zgam,zthe
+      use slope_mod, only: theta_sl,psi_sl
+      use comsoil_h, only: volcapa !!MESOSCALE -- needed to fill volcapa
+#endif
+
+
       IMPLICIT NONE
 #include "dimensions.h"
@@ -80 +90 @@
 ! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
 #include"scatterers.h"
+
 #ifdef MESOSCALE
-!#include "comsoil.h"     !!MESOSCALE -- needed to fill volcapa
 #include "meso_inc/meso_inc_inifisvar.F"
 #endif
@@ -115 +125 @@
       nqmx=nq
 
-#ifdef MESOSCALE
-#include "meso_inc/meso_inc_inifisini.F"
-#endif
-
 ! --------------------------------------------------------
 !     The usual Tests
@@ -127 +133 @@
 !         PRINT*,'nlayer     = ',nlayer
 !         PRINT*,'nlayermx   = ',nlayermx
-!         STOP
-!      ENDIF
-
-!      IF (ngrid.NE.ngridmx) THEN
-!         PRINT*,'STOP in inifis'
-!         PRINT*,'Probleme de dimensions :'
-!         PRINT*,'ngrid     = ',ngrid
-!         PRINT*,'ngridmx   = ',ngridmx
 !         STOP
 !      ENDIF
@@ -848 +846 @@
       ! allocate arrays in "conc_mod"
       call ini_conc_mod(ngrid,nlayer)
-      
+    
+!! MESOSCALE INITIALIZATIONS 
+#ifdef MESOSCALE
+#include "meso_inc/meso_inc_inifisini.F"
+#endif
+ 
       END

trunk/LMDZ.MARS/libf/phymars/meso_inc/meso_dimphys.h_ref

@@ -2 +2 @@
 !   INCLUDE 'dimphys.h'
 
-
-         INTEGER, parameter :: wiim=--xsize--
-         INTEGER, parameter :: wjjm=--ysize--
-         INTEGER, PARAMETER :: ngridmx=--physize--
          INTEGER, parameter :: nlayermx=--zsize--
-         INTEGER, PARAMETER :: nsoilmx=--soilsize--
         
 !-----------------------------------------------------------------------

trunk/LMDZ.MARS/libf/phymars/meso_inc/meso_inc_caps.F

@@ -24 +24 @@
           !! Perennial H20 north cap defined by watercaptag=true (allows surface to be
           !! hollowed by sublimation in vdifc).
-          do ig=1,ngridmx
+          do ig=1,ngrid
             qsurf(ig,igcm_h2o_ice)=0.  !! on jette les inputs GCM
             if ( ( lati(ig)*180./pi .gt. 70. ) .and.
@@ -34 +34 @@
                     dryness(ig)      = 1.
             endif  ! (lati, albedodat)
-          end do ! (ngridmx)
+          end do ! (ngrid)
       ELSE  ! (caps)
           print *,'Blork !!!'

trunk/LMDZ.MARS/libf/phymars/meso_inc/meso_inc_ini.F

@@ -14 +14 @@
 c
       tsurf(:)=wtsurf(:)
-      PRINT*,'check: tsurf ',tsurf(1),tsurf(ngridmx)
+      PRINT*,'check: tsurf ',tsurf(1),tsurf(ngrid)
       tsoil(:,:)=wtsoil(:,:)
-      PRINT*,'check: tsoil ',tsoil(1,1),tsoil(ngridmx,nsoilmx)
+      PRINT*,'check: tsoil ',tsoil(1,1),tsoil(ngrid,nsoilmx)
 c     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 c     !!!new physics
@@ -23 +23 @@
 c      PRINT*, 'check z0 ', z0(1)
       inertiedat(:,:)=wisoil(:,:)
-      PRINT*,'check: inert ',inertiedat(1,1),inertiedat(ngridmx,nsoilmx)
+      PRINT*,'check: inert ',inertiedat(1,1),inertiedat(ngrid,nsoilmx)
       mlayer(0:nsoilmx-1)=wdsoil(1,:)
       PRINT*,'check: midlayer ', mlayer(:)
@@ -46 +46 @@
      !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       emis(:)=wemis(:)
-      PRINT*,'check: emis ',emis(1),emis(ngridmx)
+      PRINT*,'check: emis ',emis(1),emis(ngrid)
       q2(:,:)=wq2(:,:)
-      PRINT*,'check: q2 ',q2(1,1),q2(ngridmx,nlayermx+1)
+      PRINT*,'check: q2 ',q2(1,1),q2(ngrid,nlayermx+1)
       qsurf(:,:)=wqsurf(:,:)
-      PRINT*,'check: qsurf ',qsurf(1,1),qsurf(ngridmx,nq)
+      PRINT*,'check: qsurf ',qsurf(1,1),qsurf(ngrid,nq)
       co2ice(:)=wco2ice(:)
-      PRINT*,'check: co2 ',co2ice(1),co2ice(ngridmx)
+      PRINT*,'check: co2 ',co2ice(1),co2ice(ngrid)
       day_ini=wday_ini
 
@@ -79 +79 @@
       !!!!
       !IF ( caps .and. water ) THEN
-      !    do ig=1,ngridmx
+      !    do ig=1,ngrid
       !      if ( lati(ig)*180./pi .gt. lat_lim ) then
       !         if ( albedodat(ig) .ge. alb_lim ) then
@@ -89 +89 @@
       !         endif
       !      endif  ! (lati, albedodat)
-      !    end do ! (ngridmx)
+      !    end do ! (ngrid)
       !ENDIF ! (caps)

trunk/LMDZ.MARS/libf/phymars/meso_inc/meso_inc_var.F

@@ -1 +1 @@
       INTEGER wday_ini
-      REAL wtsurf(ngridmx)  ! input only ay firstcall - output
-      REAL wtsoil(ngridmx,nsoilmx)
-      REAL wisoil(ngridmx,nsoilmx)  !! new soil scheme
-      REAL wdsoil(ngridmx,nsoilmx)   !! new soil scheme
-      REAL wco2ice(ngridmx)
-      REAL wemis(ngridmx)
-      REAL wqsurf(ngridmx,nq)
-      REAL wq2(ngridmx,nlayermx+1)
-      REAL wwstar(ngridmx)
-      REAL wfluxrad(ngridmx)
-      REAL output_tab2d(ngridmx,n2d)
-      REAL output_tab3d(ngridmx,nlayer,n3d)
-      REAL sensheat(ngridmx)    !! pour LES avec isfflx!=0
-      !REAL ustar(ngridmx)    !! pour LES avec isfflx!=0 !! already defined
+      REAL wtsurf(ngrid)  ! input only ay firstcall - output
+      REAL wtsoil(ngrid,nsoilmx)
+      REAL wisoil(ngrid,nsoilmx)  !! new soil scheme
+      REAL wdsoil(ngrid,nsoilmx)   !! new soil scheme
+      REAL wco2ice(ngrid)
+      REAL wemis(ngrid)
+      REAL wqsurf(ngrid,nq)
+      REAL wq2(ngrid,nlayermx+1)
+      REAL wwstar(ngrid)
+      REAL wfluxrad(ngrid)
+      REAL output_tab2d(ngrid,n2d)
+      REAL output_tab3d(ngrid,nlayer,n3d)
+      REAL sensheat(ngrid)    !! pour LES avec isfflx!=0
+      !REAL ustar(ngrid)    !! pour LES avec isfflx!=0 !! already defined
       LOGICAL flag_LES     !! pour LES avec isfflx!=0
-      REAL qsurfice(ngridmx) !! pour diagnostics
+      REAL qsurfice(ngrid) !! pour diagnostics
       real alpha,lay1 ! coefficients for building layers
       integer iloop
@@ -22 +22 @@
 
       !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JF 
-      REAL qsurfdust(ngridmx)         ! useful for dust diagnostics
-      REAL TAU_lay(ngridmx)           ! true opacity (it's not e reference life tauref)
-      REAL dsodust(ngridmx,nlayermx)
-      REAL zdqsdif_diag(ngridmx)      ! useful for lifting diagnostics                               
-      REAL zdqssed_diag(ngridmx)      ! useful for sedimentation diagnostics                         
-      REAL pdq_diag(ngridmx)          ! useful for dust perturbation diagnostics   
-      REAL dustot(ngridmx)            ! Total mass of dust integrated along vertical axe (kg/m2)
-      REAL zdqnorm(ngridmx,nlayermx,2)
+      REAL qsurfdust(ngrid)         ! useful for dust diagnostics
+      REAL TAU_lay(ngrid)           ! true opacity (it's not e reference life tauref)
+      REAL dsodust(ngrid,nlayermx)
+      REAL zdqsdif_diag(ngrid)      ! useful for lifting diagnostics                               
+      REAL zdqssed_diag(ngrid)      ! useful for sedimentation diagnostics                         
+      REAL pdq_diag(ngrid)          ! useful for dust perturbation diagnostics   
+      REAL dustot(ngrid)            ! Total mass of dust integrated along vertical axe (kg/m2)
+      REAL zdqnorm(ngrid,nlayermx,2)
       !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JF

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

@@ -28 +28 @@
       use slope_mod, only: theta_sl, psi_sl
       use conc_mod, only: rnew, cpnew, mmean
+
+#ifdef MESOSCALE
+      use comsoil_h, only: mlayer,layer
+      use surfdat_h, only: z0_default
+#endif
+
       IMPLICIT NONE
 c=======================================================================

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

@@ -229 +229 @@
       write(*,*) 'Reading tab_cntrl when calling tabfi before changes'
       write(*,*) '*****************************************************'
-      write(*,5) '(1)      = ngridmx?',tab_cntrl(tab0+1)!,real(ngridmx)
+      write(*,5) '(1)        = ngrid?',tab_cntrl(tab0+1)
       write(*,5) '(2)            lmax',tab_cntrl(tab0+2),real(lmax)
       write(*,5) '(3)         day_ini',tab_cntrl(tab0+3),real(day_ini)
@@ -495 +495 @@
       write(*,*) 'Reading tab_cntrl when calling tabfi AFTER changes'
       write(*,*) '*****************************************************'
-      write(*,5) '(1)      = ngridmx?',tab_cntrl(tab0+1)!,real(ngridmx)
+      write(*,5) '(1)        = ngrid?',tab_cntrl(tab0+1)
       write(*,5) '(2)            lmax',tab_cntrl(tab0+2),real(lmax)
       write(*,5) '(3)         day_ini',tab_cntrl(tab0+3),real(day_ini)

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

@@ -663 +663 @@
 c  It is needed to transfert physics variables to "physiq"...
 
-      call physdem0("startfi.nc",long,lati,nsoilmx,ngridmx,llm,nq,
+      call physdem0("startfi.nc",long,lati,nsoilmx,ngrid,llm,nq,
      .              dtphys,float(day0),time,area,
      .              albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe)
-      call physdem1("startfi.nc",nsoilmx,ngridmx,llm,nq,
+      call physdem1("startfi.nc",nsoilmx,ngrid,llm,nq,
      .              dtphys,time,
      .              tsurf,tsoil,co2ice,emis,q2,qsurf)