Changeset 764 for LMDZ4/trunk/libf/dyn3dpar/gcm.F

Timestamp:

Jun 4, 2007, 4:13:10 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Merge entre la version V3_conv et le HEAD
YM, JG, LF

File:

• LMDZ4/trunk/libf/dyn3dpar/gcm.F (modified) (8 diffs)

LMDZ4/trunk/libf/dyn3dpar/gcm.F

@@ -14 +14 @@
       USE mod_hallo
       USE Bands
-#ifdef INCA
-      USE inca_dim
-#endif
       IMPLICIT NONE
 
@@ -64 +61 @@
 #include "iniprint.h"
 #include "tracstoke.h"
-
+#include "advtrac.h"
 
       INTEGER         longcles
@@ -119 +116 @@
       REAL      d_h_vcol, d_qt, d_qw, d_ql, d_ec
       CHARACTER*15 ztit
-      INTEGER   ip_ebil_dyn  ! PRINT level for energy conserv. diag.
-      SAVE      ip_ebil_dyn
-      DATA      ip_ebil_dyn/0/
 c-jld 
 
@@ -161 +155 @@
       dynhistave_file = 'dyn_hist_ave'
 
+
+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 :
@@ -208 +214 @@
       call InitDimphy
       call InitBands
+      call MPI_BARRIER(COMM_LMDZ,ierr)
       if (mpi_rank==0) call WriteBands
       call SetDistrib(jj_Nb_Caldyn)
@@ -218 +225 @@
       enddo
       call Init_Mod_hallo(MPI_Buffer)
-
+c$OMP PARALLEL
+      call init_phys_openmp
       call InitComgeomphy
-
+c$OMP END PARALLEL 
 #ifdef INCA
-      call init_inca_dim
+      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
 
@@ -251 +260 @@
       endif
 
+#ifdef INCA
+      call init_inca_dim(klon,llm,iim,jjm,
+     $     rlonu,rlatu,rlonv,rlatv)
+#endif
 
 
@@ -362 +375 @@
          WRITE(lunout,*)
      .           'WARNING!!! vitesse verticale nulle dans la physique'
+
          CALL iniphysiq(ngridmx,llm,daysec,day_ini,dtphys ,
      ,                latfi,lonfi,airefi,zcufi,zcvfi,rad,g,r,cpp     )
+
          call_iniphys=.false.
       ENDIF