Changeset 1576 for trunk/LMDZ.MARS

Timestamp:

Jul 27, 2016, 11:14:41 AM (9 years ago)

Author:

emillour

Message:

All models:
Clean up the dynamics/physics interface to converge with LMDZ5;
get rid of tracerdyn parameter (which was supposed to send information
about wether tracers should be advected or not in the Mars and Generic
models).
EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/dyn3d/gcm.F (modified) (4 diffs)
• libf/dynphy_lonlat/calfis.F (modified) (4 diffs)
• libf/dynphy_lonlat/phymars/callphysiq_mod.F90 (modified) (3 diffs)
• libf/phymars/dyn1d/testphys1d.F (modified) (2 diffs)
• libf/phymars/physiq_mod.F (modified) (4 diffs)

trunk/LMDZ.MARS/README

@@ -2312 +2312 @@
 package (directory phymars) must be done in the related phymars/iniphysiq
 routine.
+
+== 27/07/2016 == EM
+- further cleanup in the dynamics/physics interface: stop sending information
+  about tracer advection (tracerdyn) back from physics to dynamics as this
+  input parameter can be read and set in the dynamics.

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

@@ -1 +1 @@
       PROGRAM gcm
 
+      use ioipsl_getincom, only: getin
       use infotrac, only: iniadvtrac, nqtot, iadv
       use control_mod, only: day_step, iperiod, iphysiq, ndynstep,
@@ -129 +130 @@
       character*80 abort_message
 
-      LOGICAL tracer
-          data tracer/.true./
-!      INTEGER nq
-
+! flag to run with or without tracer transport (read from run.def)
+      logical tracer
+      
 C Calendrier
       LOGICAL true_calendar
@@ -161 +161 @@
 c-----------------------------------------------------------------------
       CALL defrun_new( 99, .TRUE. )
+      WRITE(*,*) ""
+      WRITE(*,*) "Run with or without tracer transport ?"
+      tracer=.true. ! default value
+      call getin("tracer",tracer)
+      WRITE(*,*)" tracer = ",tracer
 
 ! Initialize tracers
@@ -491 +496 @@
         CALL calfis( nqtot, lafin ,rdayvrai,rday_ecri,time  ,
      $                 ucov,vcov,teta,q,masse,ps,p,pk,phis,phi ,
-     $     du,dv,dteta,dq,w, dufi,dvfi,dhfi,dqfi,dpfi,tracer)
+     $     du,dv,dteta,dq,w, dufi,dvfi,dhfi,dqfi,dpfi)
 
 

trunk/LMDZ.MARS/libf/dynphy_lonlat/calfis.F

@@ -2 +2 @@
      $            pucov,pvcov,pteta,pq,pmasse,pps,pp,ppk,pphis,pphi,
      $            pducov,pdvcov,pdteta,pdq,pw,
-     $            pdufi,pdvfi,pdhfi,pdqfi,pdpsfi,tracer )
+     $            pdufi,pdvfi,pdhfi,pdqfi,pdpsfi )
 c
 c    Auteur :  P. Le Van, F. Hourdin 
@@ -56 +56 @@
 c        pdtsfi         tendency for the surface temperature
 c
-c        tracer         Call tracer in  gcm.F ? (decided in callphys.def)
-c
 c=======================================================================
 c
@@ -103 +101 @@
       REAL pdqfi(iip1,jjp1,llm,nq)
       REAL pdpsfi(iip1,jjp1)
-      logical tracer
 
 c    Local variables :
@@ -437 +434 @@
      ,     flxwfi,
 C - sorties
-     s     zdufi, zdvfi, zdtfi, zdqfi,zdpsrf,tracer)
+     s     zdufi, zdvfi, zdtfi, zdqfi,zdpsrf)
 
 

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/callphysiq_mod.F90

@@ -16 +16 @@
                        zufi_omp,zvfi_omp,zrfi_omp,ztfi_omp,zqfi_omp,      &
                        flxwfi_omp,pducov,                                 &
-                       zdufi_omp,zdvfi_omp,zdtfi_omp,zdqfi_omp,zdpsrf_omp,&
-                       tracerdyn)
+                       zdufi_omp,zdvfi_omp,zdtfi_omp,zdqfi_omp,zdpsrf_omp)
 
   USE control_mod, ONLY: planet_type
@@ -52 +51 @@
   REAL,INTENT(OUT) :: zdqfi_omp(klon,llm,nqtot) ! tendency on tracers
   REAL,INTENT(OUT) :: zdpsrf_omp(klon) ! tendency on surface pressure
-  LOGICAL,INTENT(OUT) :: tracerdyn
 
   ! Local variables
@@ -89 +87 @@
               zdtfi_omp,      & ! pdt
               zdqfi_omp,      & ! pdq
-              zdpsrf_omp,     & ! pdpsrf
-              tracerdyn)        ! tracerdyn (somewhat obsolete)
+              zdpsrf_omp)       ! pdpsrf
 
 

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

@@ -109 +109 @@
       INTEGER ierr, aslun
       REAL tmp1(0:nlayer),tmp2(0:nlayer)
-      Logical  tracerdyn
       integer :: nq=1 ! number of tracers
       real :: latitude(1), longitude(1), cell_area(1)
@@ -753 +752 @@
      ,     w,
 C - outputs
-     s     du, dv, dtemp, dq,dpsurf,tracerdyn)
+     s     du, dv, dtemp, dq,dpsurf)
 !      write(*,*) "testphys1d apres q", q(1,:)
 

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

@@ -12 +12 @@
      $            ,pu,pv,pt,pq
      $            ,flxw
-     $            ,pdu,pdv,pdt,pdq,pdpsrf,tracerdyn)
+     $            ,pdu,pdv,pdt,pdq,pdpsrf)
 
       use tracer_mod, only: noms, mmol, igcm_co2, igcm_n2,
@@ -146 +146 @@
 c    pdq(ngrid,nlayer,nq)    |
 c    pdpsrf(ngrid)           |
-c    tracerdyn                 call tracer in dynamical part of GCM ?
 
 c
@@ -191 +190 @@
       REAL,INTENT(out) :: pdq(ngrid,nlayer,nq) ! tracer tendencies (../kg/s)
       REAL,INTENT(out) :: pdpsrf(ngrid) ! surface pressure tendency (Pa/s)
-      LOGICAL,INTENT(out) :: tracerdyn ! signal to the dynamics to advect tracers or not
 
 
@@ -434 +432 @@
 c        initialize tracers
 c        ~~~~~~~~~~~~~~~~~~
-         tracerdyn=tracer
          IF (tracer) THEN
             CALL initracer(ngrid,nq,qsurf)