Changeset 3413 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/regr_pr_time_av_m.F90

Timestamp:

Nov 12, 2018, 1:52:29 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Inclusion of Yann's latest (summer/fall 2018) modifications for
convergence of DYNAMICO/LMDZ physics
YM/LF

File:

• LMDZ6/branches/DYNAMICO-conv/libf/phylmd/regr_pr_time_av_m.F90 (modified) (3 diffs)

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

@@ -106 +106 @@
   USE assert_m,       ONLY: assert
   USE assert_eq_m,    ONLY: assert_eq
-!  USE comvert_mod,    ONLY: scaleheight
+!!  USE comvert_mod,    ONLY: scaleheight
   USE interpolation,  ONLY: locate
   USE regr_conserv_m, ONLY: regr_conserv
   USE regr_lint_m,    ONLY: regr_lint
   USE slopes_m,       ONLY: slopes
-  USE mod_phys_lmdz_mpi_data,       ONLY: is_mpi_root
-  USE mod_grid_phy_lmdz,            ONLY: nbp_lon, nbp_lat, nbp_lev
-  USE mod_phys_lmdz_transfert_para, ONLY: scatter2d, scatter
+  USE mod_phys_lmdz_para,           ONLY: is_mpi_root,is_master
+  USE mod_grid_phy_lmdz,            ONLY: nbp_lon, nbp_lat, nbp_lev, klon_glo, grid_type, unstructured
+  USE mod_phys_lmdz_transfert_para, ONLY: scatter2d, scatter, gather
   USE phys_cal_mod,                 ONLY: calend, year_len, days_elapsed, jH_cur
+  USE geometry_mod,                 ONLY: ind_cell_glo
 !-------------------------------------------------------------------------------
 ! Arguments:
@@ -157 +158 @@
   REAL, DIMENSION(nbp_lon, nbp_lat)   :: ps1, pt1, ot1
   REAL, DIMENSION(klon)               :: ps2, pt2, ot2, ptropou
+  INTEGER,ALLOCATABLE :: ind_cell_glo_glo(:)
   LOGICAL :: ll
 !-------------------------------------------------------------------------------
@@ -230 +232 @@
     CALL bcast(lO3Trop); CALL bcast(linterp)
   END IF
+  
+  IF (is_master) THEN 
+    ALLOCATE(ind_cell_glo_glo(klon_glo))
+  ELSE
+    ALLOCATE(ind_cell_glo_glo(0))
+  ENDIF
+  CALL gather(ind_cell_glo,ind_cell_glo_glo)
+  IF (is_master .AND. grid_type==unstructured) v1(:,:,:,:)=v1(:,ind_cell_glo_glo(:),:,:)
+  
   CALL scatter2d(v1,v2)
+
   !--- No "ps" in input file => assumed to be equal to current LMDZ ground press
-  IF(lPrSurf) THEN; CALL scatter2d(ps1,ps2); ELSE; ps2=pint_ou(:,1); END IF
-  IF(lPrTrop) CALL scatter2d(pt1,pt2)
-  IF(lO3Trop) CALL scatter2d(ot1,ot2)
-
+  IF(lPrSurf) THEN
+    IF (is_master .AND. grid_type==unstructured) ps1(:,:)=ps1(:,ind_cell_glo_glo(:))
+    CALL scatter2d(ps1,ps2)
+  ELSE
+   ps2=pint_ou(:,1)
+  END IF
+
+  IF(lPrTrop) THEN
+    IF (is_master .AND. grid_type==unstructured) pt1(:,:)=pt1(:,ind_cell_glo_glo(:))
+    CALL scatter2d(pt1,pt2)
+  ENDIF
+
+  IF(lO3Trop) THEN
+    IF (is_master .AND. grid_type==unstructured) ot1(:,:)=ot1(:,ind_cell_glo_glo(:))
+    CALL scatter2d(ot1,ot2)
+  ENDIF
   !--- REGRID IN PRESSURE ; 3rd index inverted because "paprs" is decreasing
   IF(.NOT.lAdjTro) THEN