Changeset 4482 for LMDZ6/branches/LMDZ_ECRad/libf/phy_common

Timestamp:

Mar 29, 2023, 3:14:27 PM (20 months ago)

Author:

lguez

Message:

Sync latest trunk changes to branch LMDZ_ECRad

Location:

LMDZ6/branches/LMDZ_ECRad

Files:

• . (modified) (1 prop)
• libf/phy_common/abort_physic.F90 (modified) (1 diff)
• libf/phy_common/physics_distribution_mod.F90 (modified) (4 diffs)
• libf/phy_common/vertical_layers_mod.F90 (modified) (5 diffs)

LMDZ6/branches/LMDZ_ECRad/libf/phy_common/abort_physic.F90

@@ -38 +38 @@
       if (ierr .eq. 0) then
         write(lunout,*) 'Everything is cool'
+#ifdef CPP_MPI
+        !$OMP CRITICAL (MPI_ABORT_PHYSIC)
+        call MPI_ABORT(COMM_LMDZ_PHY, 0, ierror_mpi)
+        !$OMP END CRITICAL (MPI_ABORT_PHYSIC)
+#else
+        stop 0
+#endif          
       else
         write(lunout,*) 'Houston, we have a problem, ierr = ', ierr

LMDZ6/branches/LMDZ_ECRad/libf/phy_common/physics_distribution_mod.F90

@@ -13 +13 @@
   USE mod_grid_phy_lmdz, ONLY: init_grid_phy_lmdz
   USE dimphy, ONLY : Init_dimphy
-  USE infotrac_phy, ONLY : types_trac
+  USE infotrac_phy, ONLY : type_trac
 #ifdef REPROBUS
   USE CHEM_REP, ONLY : Init_chem_rep_phys
@@ -39 +39 @@
 #ifdef REPROBUS
 ! Initialization of Reprobus
-    IF (ANY(types_trac == 'repr')) CALL Init_chem_rep_phys(klon_omp,nbp_lev)
-    END IF
+    IF (type_trac == 'repr') CALL Init_chem_rep_phys(klon_omp,nbp_lev)
 #endif
 
@@ -51 +50 @@
 !  USE mod_grid_phy_lmdz, ONLY: Init_grid_phy_lmdz!, nbp_lev
 !  USE dimphy, ONLY : Init_dimphy
-!  USE infotrac_phy, ONLY : types_trac
+!  USE infotrac_phy, ONLY : type_trac
 !#ifdef REPROBUS
 !  USE CHEM_REP, ONLY : Init_chem_rep_phys
@@ -72 +71 @@
 !#ifdef REPROBUS
 !! Initialization of Reprobus
-!    IF (ANY(types_trac == 'repr')) CALL Init_chem_rep_phys(klon_omp,nbp_lev)
+!    IF (type_trac == 'repr') CALL Init_chem_rep_phys(klon_omp,nbp_lev)
 !    END IF
 !#endif

LMDZ6/branches/LMDZ_ECRad/libf/phy_common/vertical_layers_mod.F90

@@ -15 +15 @@
    REAL,SAVE,ALLOCATABLE :: presnivs(:) ! reference pressure at mid-layer (Pa),
                                         ! based on preff, ap and bp
+   REAL,SAVE,ALLOCATABLE :: presinter(:) ! reference pressure at interface (Pa),
+                                        ! based on preff, ap and bp
    REAL,SAVE,ALLOCATABLE :: pseudoalt(:) ! pseudo-altitude of model layers (km),
                                          ! based on preff and scaleheight
    
-!$OMP THREADPRIVATE(preff,scaleheight,ap,bp,aps,bps,presnivs,pseudoalt)
+!$OMP THREADPRIVATE(preff,scaleheight,ap,bp,aps,bps,presnivs,presinter,pseudoalt)
 
 
@@ -24 +26 @@
 
   SUBROUTINE init_vertical_layers(nlayer,preff_,scaleheight_,ap_,bp_,&
-                                 aps_,bps_,presnivs_, pseudoalt_)
+                                 aps_,bps_,presnivs_, presinter_, pseudoalt_)
     IMPLICIT NONE
     INTEGER,INTENT(IN) :: nlayer ! number of atmospheric layers
@@ -34 +36 @@
     REAL,INTENT(IN)    :: bps_(nlayer) ! hybrid coordinate at mid-layer
     REAL,INTENT(IN)    :: presnivs_(nlayer) ! Appproximative pressure of atm. layers (Pa)
+    REAL,INTENT(IN)    :: presinter_(nlayer+1) ! Appproximative pressure of atm. layers (Pa)
     REAL,INTENT(IN)    :: pseudoalt_(nlayer) ! pseudo-altitude of atm. layers (km)
   
@@ -41 +44 @@
     ALLOCATE(bps(nlayer))
     ALLOCATE(presnivs(nlayer))
+    ALLOCATE(presinter(nlayer+1))
     ALLOCATE(pseudoalt(nlayer))
   
@@ -50 +54 @@
     bps(:) = bps_(:)
     presnivs(:) = presnivs_(:)
+    presinter(:) = presinter_(:)
     pseudoalt(:) = pseudoalt_(:)