Changeset 1038 for trunk/LMDZ.MARS/libf

Timestamp:

Sep 13, 2013, 4:01:10 PM (12 years ago)

Author:

aslmd

Message:

MESOSCALE
LMDZ.MARS

--> Performed the necessary modifications for dynamic tracers

to work with the mesoscale model (new physics).

--> Added precompiling flag MESOSCALE around pressure modifications

done in revision 883. This makes the mesoscale model become crazy.

--> Added an option -e in makemeso to erase a configuration and start over.

NOTE
--> not sure recent versions (rev>1000) are compliant with nesting compilation.
--> use mesoscale model + new physics with caution. still not stabilized.

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• dustlift.F (modified) (1 diff)
• initracer.F (modified) (4 diffs)
• meso_inc/meso_inc_ini.F (modified) (3 diffs)
• meso_inc/meso_inc_inifisinvar.F (modified) (1 diff)
• meso_inc/meso_inc_inifisvar.F (modified) (1 diff)
• meso_inc/meso_inc_var.F (modified) (2 diffs)
• physiq.F (modified) (4 diffs)

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

@@ -3 +3 @@
      $                  dqslift)
 
+#ifndef MESOSCALE
       use tracer_mod, only: alpha_lift, radius
+#else
+      use tracer_mod, only: alpha_lift, radius, 
+     &                      igcm_dust_mass, igcm_dust_number,
+     &                      ref_r0,r3n_q
+#endif
       IMPLICIT NONE
 

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

@@ -1 +1 @@
       SUBROUTINE initracer(ngrid,nq,qsurf,co2ice)
 
+#ifndef MESOSCALE
        use infotrac, only: tnom
+#endif
        use tracer_mod
        IMPLICIT NONE
@@ -61 +63 @@
 
 ! Initialization: allocate arrays in tracer_mod
-      allocate(noms(nq))
       allocate(mmol(nq))
       allocate(radius(nq))
@@ -70 +71 @@
       allocate(igcm_dustbin(nq))
 
+#ifndef MESOSCALE
+      allocate(noms(nq))
 ! Initialization: get tracer names from the dynamics and check if we are
 !                 using 'old' tracer convention ('q01',q02',...)
@@ -94 +97 @@
         noms(iq)=tnom(iq)
       enddo
+#endif
 
 c------------------------------------------------------------

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

@@ -39 +39 @@
 
             !!!!!!!!!!!!!!!!! DONE in soil_setting.F
-      tnom(:)=wtnom(:)   !! est rempli dans advtrac.h
-      PRINT*,'check: tracernames ', tnom
+      PRINT*,'MESOSCALE. how many tracers: ',nq
+      allocate(noms(nq)) !! est fait dans initracer normalement
+      noms(:)=wtnom(:)   !! est rempli dans tracer_mod.F90
+      PRINT*,'check: tracernames ', noms
      !!!new physics
      !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -48 +50 @@
       PRINT*,'check: q2 ',q2(1,1),q2(ngridmx,nlayermx+1)
       qsurf(:,:)=wqsurf(:,:)
-      PRINT*,'check: qsurf ',qsurf(1,1),qsurf(ngridmx,nqmx)
+      PRINT*,'check: qsurf ',qsurf(1,1),qsurf(ngridmx,nq)
       co2ice(:)=wco2ice(:)
       PRINT*,'check: co2 ',co2ice(1),co2ice(ngridmx)
@@ -62 +64 @@
       iphysiq=ptimestep
 c
-      !DO iq=1, nq 
-      !  PRINT*, tnom(iq), pq(:,:,iq)
-      !ENDDO
 
 c

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

@@ -1 @@
-     $           ,nq,wdt
+     $           ,wdt
      $           ,womeg,wmugaz
      $           ,wyear_day,wperiheli,waphelie,wperi_day,wobliquit 

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

@@ -1 @@
-      INTEGER nq
       REAL wdt
 

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

@@ -6 +6 @@
       REAL wco2ice(ngridmx)
       REAL wemis(ngridmx)
-      REAL wqsurf(ngridmx,nqmx)
+      REAL wqsurf(ngridmx,nq)
       REAL wq2(ngridmx,nlayermx+1)
       REAL wwstar(ngridmx)
@@ -19 +19 @@
       integer iloop
       INTEGER tracerset    !!! this corresponds to config%mars
-      CHARACTER (len=20) :: wtnom(nqmx) ! tracer name
+      CHARACTER (len=20) :: wtnom(nq) ! tracer name
 
       !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JF 

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

@@ -18 +18 @@
      &                      nuice_ref, rho_ice, rho_dust, ref_r0
 
-#ifdef MESOSCALE
-      use infotrac !!! this is necessary for tracers 
-#endif
       IMPLICIT NONE
 c=======================================================================
@@ -372 +369 @@
       REAL, ALLOCATABLE, DIMENSION(:,:) :: T_out
       REAL, ALLOCATABLE, DIMENSION(:,:) :: u_out ! Interpolated teta and u at z_out
-!      REAL u_out1(ngridmx)
+      REAL u_out1(ngridmx)
       REAL T_out1(ngridmx)
       REAL, ALLOCATABLE, DIMENSION(:) :: z_out     ! height of interpolation between z0 and z1 [meters]
@@ -1036 +1033 @@
          ENDIF ! of IF (tracer)
 
+#ifndef MESOSCALE
         ! update surface pressure
         DO ig=1,ngrid
@@ -1058 +1056 @@
           ENDDO
         ENDDO
+#endif
       
       ENDIF  ! of IF (callcond)