Changeset 1112 for trunk/LMDZ.MARS/libf/phymars/meso_inc

Timestamp:

Nov 20, 2013, 10:26:12 AM (12 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/meso_inc

Files:

• meso_dimphys.h_ref (modified) (1 diff)
• meso_inc_caps.F (modified) (2 diffs)
• meso_inc_ini.F (modified) (5 diffs)
• meso_inc_var.F (modified) (2 diffs)

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