Changeset 726 for LMDZ4/branches/V3_test/libf/dyn3d

Timestamp:

Nov 6, 2006, 4:51:16 PM (18 years ago)

Author:

Laurent Fairhead

Message:

Modifications pour rendre INCA plus independant de LMDZ ACo
LF

Location:

LMDZ4/branches/V3_test/libf/dyn3d

Files:

• advtrac.F (modified) (4 diffs)
• advtrac.h (modified) (2 diffs)
• caladvtrac.F (modified) (3 diffs)
• gcm.F (modified) (4 diffs)
• guide.F (modified) (1 diff)
• iniadvtrac.F (modified) (2 diffs)
• leapfrog.F (modified) (3 diffs)

LMDZ4/branches/V3_test/libf/dyn3d/advtrac.F

@@ -8 +8 @@
      *                   p,  masse,q,iapptrac,teta,
      *                  flxw,
-     *                  pk,
-     *                  mmt_adj,
-     *                  hadv_flg)
+     *                  pk)
 #else
       SUBROUTINE advtrac(pbaru,pbarv ,
@@ -51 +49 @@
       REAL pk(ip1jmp1,llm)
 #ifdef INCA
-      INTEGER            :: hadv_flg(nqmx)
-      REAL               :: mmt_adj(ip1jmp1,llm,1)
       REAL               :: flxw(ip1jmp1,llm)
 #endif
@@ -215 +211 @@
 #ifdef INCA
        do iiq = iq+1, iq+3
-         q(:,:,iiq)=q(:,:,iiq)*mmt_adj(:,:,1)
+c         q(:,:,iiq)=q(:,:,iiq)*mmt_adj(:,:,1)
+          q(:,:,iiq)=q(:,:,iiq)*1
        enddo
 #endif
@@ -233 +230 @@
 #ifdef INCA
        do iiq = iq+1, iq+9
-         q(:,:,iiq)=q(:,:,iiq)*mmt_adj(:,:,1)
+c         q(:,:,iiq)=q(:,:,iiq)*mmt_adj(:,:,1)
+         q(:,:,iiq)=q(:,:,iiq)*1
        enddo
 #endif

LMDZ4/branches/V3_test/libf/dyn3d/advtrac.h

@@ -5 +5 @@
 c INCLUDE 'advtrac.h'
 
-      COMMON/advtr/iadv,hadv,vadv,tnom,tname,ttext,niadv
+      COMMON/advtr/iadv,hadv,vadv,tnom,tname,ttext,niadv,
+     &     nbtrac, nprath, mmt_adj, hadv_flg, vadv_flg, conv_flg, 
+     &     pbl_flg, tracnam
       INTEGER iadv(nqmx) ! indice schema de transport 
       INTEGER hadv(nqmx) ! indice schema transport horizontal 
@@ -13 +15 @@
       character*10 tname(nqmx) ! nom du traceur pour restart
       character*13 ttext(nqmx) ! nom long du traceur pour sorties
+
+
+      integer nbtrac
+      integer nprath
+      real    mmt_adj(iim+1,jjm+1,llm, 1) 
+      integer hadv_flg(nqmx)
+      integer vadv_flg(nqmx)
+      integer conv_flg(nqmx-2) 
+      integer pbl_flg(nqmx-2)
+      character*8 tracnam(nqmx-2) 
 c-----------------------------------------------------------------------

LMDZ4/branches/V3_test/libf/dyn3d/caladvtrac.F

@@ -8 +8 @@
      *                   p ,masse, dq ,  teta,
      *                   flxw,
-     *                   pk,
-     *                   mmt_adj,
-     *                   hadv_flg)
+     *                   pk)
 #else
             SUBROUTINE caladvtrac(q,pbaru,pbarv ,
@@ -42 +40 @@
       REAL teta( ip1jmp1,llm),pk( ip1jmp1,llm)
 #ifdef INCA
-      INTEGER            :: hadv_flg(nqmx)
-      REAL               :: mmt_adj(iip1,jjp1,llm,1)
       REAL               :: flxw(ip1jmp1,llm)
 #endif
@@ -77 +73 @@
      *             p,  masse,q,iapptrac, teta,
      .             flxw,
-     .             pk,
-     .             mmt_adj,
-     .             hadv_flg)
+     .             pk)
 #else
       CALL advtrac( pbaru,pbarv, 

LMDZ4/branches/V3_test/libf/dyn3d/gcm.F

@@ -58 +58 @@
 #include "iniprint.h"
 #include "tracstoke.h"
-
+#include "advtrac.h"
 
       INTEGER         longcles
@@ -145 +145 @@
       dynhistave_file = 'dyn_hist_ave.nc'
 
+c initialisation Anne
+      hadv_flg(:) = 0.
+      vadv_flg(:) = 0.
+      conv_flg(:) = 0.
+      pbl_flg(:)  = 0. 
+      tracnam(:)  = '        ' 
+      nprath = 1
+      nbtrac = 0
+      mmt_adj(:,:,:,:) = 1
+
+
 c--------------------------------------------------------------------------
 c   Iflag_phys controle l'appel a la physique :
@@ -188 +199 @@
       call init_phys_openmp
       call InitComgeomphy
+
+#ifdef INCA
+      call init_const_lmdz(nbtrac,anneeref,dayref,iphysiq,day_step,nday)
+      call init_inca_para(iim,jjm+1,klon2,phy_size,klon_para_nb)
+#endif
+
 c
 c
@@ -222 +239 @@
       endif
 
+#ifdef INCA
+      call init_inca_dim(klon,llm,iim,jjm,
+     $     rlonu,rlatu,rlonv,rlatv)
+#endif
 
 

LMDZ4/branches/V3_test/libf/dyn3d/guide.F

@@ -367 +367 @@
                 if (first.and.ini_anal) vcov(ij,l)=a
             enddo
-            if (first.and.ini_anal) vcov(ij,l)=a
          enddo
       endif

LMDZ4/branches/V3_test/libf/dyn3d/iniadvtrac.F

@@ -6 +6 @@
       subroutine iniadvtrac(nq)
       USE ioipsl
-#ifdef INCA
-      USE transport_controls, only : hadv_flg, vadv_flg
-      USE species_names
-      USE chemshut
-#endif
       IMPLICIT NONE
 c=======================================================================
@@ -59 +54 @@
       descrq(20)='SLP'
       descrq(30)='PRA'
+
+#ifdef INCA
+
+      CALL init_transport( 
+     $     hadv_flg,
+     $     vadv_flg,
+     $     conv_flg,
+     $     pbl_flg,
+     $     tracnam)
+#endif
 
 c-----------------------------------------------------------------------

LMDZ4/branches/V3_test/libf/dyn3d/leapfrog.F

@@ -7 +7 @@
      &                    time_0)
 
-#ifdef INCA
-      USE transport_controls, ONLY : hadv_flg, mmt_adj
-#endif
 
 cIM : pour sortir les param. du modele dans un fis. netcdf 110106
@@ -61 +58 @@
 #include "com_io_dyn.h"
 #include "iniprint.h"
-
+#include "advtrac.h"
 c#include "tracstoke.h"
 
@@ -297 +294 @@
      *                      p, masse, dq,  teta,
      .             flxw,
-     .             pk,
-     .             mmt_adj,
-     .             hadv_flg)
+     .             pk)
 #else
              CALL caladvtrac(q,pbaru,pbarv,