Changeset 3050

Timestamp:

Oct 30, 2017, 10:20:20 AM (7 years ago)

Author:

Laurent Fairhead

Message:

Initialisation manquantes et deplacement de Init_dimphy

Location:

LMDZ6/branches/DYNAMICO-conv/libf

Files:

• dynphy_lonlat/phydev/iniphysiq_mod.F90 (modified) (1 diff)
• dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (1 diff)
• phy_common/physics_distribution_mod.F90 (modified) (2 diffs)
• phylmd/phys_local_var_mod.F90 (modified) (5 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/dynphy_lonlat/phydev/iniphysiq_mod.F90

@@ -71 +71 @@
   CALL inifis(prad,pg,pr,pcpp)
   
-  ! Initialize dimphy module
-  CALL Init_dimphy(klon_omp,nlayer)
-
   ! Initialize tracer names, numbers, etc. for physics
   CALL init_infotrac_phy(nqtot,type_trac)

LMDZ6/branches/DYNAMICO-conv/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -115 +115 @@
 
   ! Initialize dimphy module (unless in 1D where it has already been done)
-  IF (klon_glo>1) CALL Init_dimphy(klon_omp,nlayer)
+!  IF (klon_glo>1) CALL Init_dimphy(klon_omp,nlayer)
 
   ! Copy over "offline" settings

LMDZ6/branches/DYNAMICO-conv/libf/phy_common/physics_distribution_mod.F90

@@ -10 +10 @@
                                        nbp, nbp_lon, nbp_lat, nbp_lev, &
                                        communicator)
-  USE mod_phys_lmdz_para, ONLY: init_phys_lmdz_para
+  USE mod_phys_lmdz_para, ONLY: init_phys_lmdz_para, klon_omp
   USE mod_grid_phy_lmdz, ONLY: init_grid_phy_lmdz
+  USE dimphy, ONLY : Init_dimphy
+  USE infotrac_phy, ONLY : type_trac
+#ifdef REPROBUS
+  USE CHEM_REP, ONLY : Init_chem_rep_phys
+#endif
+
   IMPLICIT NONE
     INTEGER,INTENT(IN) :: grid_type 
@@ -24 +30 @@
     CALL init_grid_phy_lmdz(grid_type,nvertex, nbp_lon,nbp_lat,nbp_lev)
     CALL init_phys_lmdz_para(nbp,nbp_lon, nbp_lat, communicator)
+!$OMP PARALLEL
+    CALL init_dimphy(klon_omp,nbp_lev)
+
+! Initialization of Reprobus
+    IF (type_trac == 'repr') THEN
+#ifdef REPROBUS
+       CALL Init_chem_rep_phys(klon_omp,nbp_lev)
+#endif
+    END IF
+
+!$OMP END PARALLEL
 
   END SUBROUTINE init_physics_distribution  

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/phys_local_var_mod.F90

@@ -335 +335 @@
 !$OMP THREADPRIVATE(zxfluxlat_x, zxfluxlat_w)
 !jyg<
-!!! Entr\E9es suppl\E9mentaires couche-limite
+!!! Entrees supplementaires couche-limite
 !!      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: t_x, t_w
 !!!$OMP THREADPRIVATE(t_x, t_w)
@@ -346 +346 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: dqvdf_x, dqvdf_w
 !$OMP THREADPRIVATE(dqvdf_x, dqvdf_w)
-! Variables suppl\E9mentaires dans physiq.F relative au splitting de la surface
+! Variables supplementaires dans physiq.F relative au splitting de la surface
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:,:) :: pbl_tke_input
 !$OMP THREADPRIVATE(pbl_tke_input)
@@ -638 +638 @@
       ALLOCATE(toplwad0_aerop(klon), sollwad0_aerop(klon))
 
-! FH Ajout de celles n??cessaires au phys_output_write_mod
+! FH Ajout de celles necessaires au phys_output_write_mod
 
       ALLOCATE(tal1(klon), pal1(klon), pab1(klon), pab2(klon))
@@ -703 +703 @@
       ALLOCATE(sens(klon), flwp(klon), fiwp(klon))
       ALLOCATE(ale_bl_stat(klon), alp_bl_conv(klon), alp_bl_det(klon))
+      ale_bl_stat(:)=0 ; alp_bl_conv(:)=0 ;  alp_bl_det(:)=0
       ALLOCATE(alp_bl_fluct_m(klon), alp_bl_fluct_tke(klon))
+      alp_bl_fluct_m(:)=0 ; alp_bl_fluct_tke(:)= 0.
       ALLOCATE(alp_bl_stat(klon), n2(klon), s2(klon))
+      alp_bl_stat(:)=0
       ALLOCATE(proba_notrig(klon), random_notrig(klon))
 
@@ -914 +917 @@
       DEALLOCATE(toplwad0_aerop, sollwad0_aerop)
 
-! FH Ajout de celles n??cessaires au phys_output_write_mod
+! FH Ajout de celles necessaires au phys_output_write_mod
       DEALLOCATE(tal1, pal1, pab1, pab2)
       DEALLOCATE(ptstar, pt0, slp)