Changeset 2641 for LMDZ5/branches/testing/libf/dyn3d/gcm.F90

Timestamp:

Sep 29, 2016, 11:26:46 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2593:2640 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3d/gcm.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/dyn3d/gcm.F90

@@ -23 +23 @@
   USE control_mod
   USE mod_const_mpi, ONLY: COMM_LMDZ
-
+  USE temps_mod, ONLY: calend,start_time,annee_ref,day_ref, &
+                     itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end
+  USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
+  USE logic_mod, ONLY: ecripar, iflag_phys, read_start
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -68 +71 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comdissnew.h"
-  include "comvert.h"
   include "comgeom.h"
-  include "logic.h"
-  include "temps.h"
-!!!!!!!!!!!include "control.h"
-  include "ener.h"
   include "description.h"
-  include "serre.h"
-  !include "com_io_dyn.h"
   include "iniprint.h"
   include "tracstoke.h"
@@ -89 +84 @@
   REAL, ALLOCATABLE, DIMENSION(:,:,:):: q! champs advectes
   REAL ps(ip1jmp1)                       ! pression  au sol
-  REAL p (ip1jmp1,llmp1  )               ! pression aux interfac.des couches
+!  REAL p (ip1jmp1,llmp1  )               ! pression aux interfac.des couches
   REAL masse(ip1jmp1,llm)                ! masse d'air
   REAL phis(ip1jmp1)                     ! geopotentiel au sol
-  REAL phi(ip1jmp1,llm)                  ! geopotentiel
-  REAL w(ip1jmp1,llm)                    ! vitesse verticale
+!  REAL phi(ip1jmp1,llm)                  ! geopotentiel
+!  REAL w(ip1jmp1,llm)                    ! vitesse verticale
 
   ! variables dynamiques intermediaire pour le transport
@@ -103 +98 @@
 
   LOGICAL lafin
-  INTEGER ij,iq,l,i,j
 
 
   real time_step, t_wrt, t_ops
-
-  LOGICAL first
 
   !      LOGICAL call_iniphys
@@ -118 +110 @@
   !     tansformation d'energie cinetique en energie thermique
   !     cree par la dissipation
-  REAL dhecdt(ip1jmp1,llm)
+!  REAL dhecdt(ip1jmp1,llm)
   !      REAL vcont(ip1jm,llm),ucont(ip1jmp1,llm)
   !      REAL      d_h_vcol, d_qt, d_qw, d_ql, d_ec
-  CHARACTER (len=15) :: ztit
+!  CHARACTER (len=15) :: ztit
   !-jld