Changeset 4446 for LMDZ6/branches/Portage_acc/libf/phy_common

Timestamp:

Mar 1, 2023, 6:22:39 PM (16 months ago)

Author:

Laurent Fairhead

Message:

Merged trunk revisions from 4127 to 4443 (HEAD) into branch

Location:

LMDZ6/branches/Portage_acc/libf/phy_common

Files:

• physics_distribution_mod.F90 (modified) (2 diffs)
• vertical_layers_mod.F90 (modified) (5 diffs)

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

@@ -37 +37 @@
 #endif
 
+#ifdef REPROBUS
 ! Initialization of Reprobus
-    IF (type_trac == 'repr') THEN
-#ifdef REPROBUS
-       CALL Init_chem_rep_phys(klon_omp,nbp_lev)
+    IF (type_trac == 'repr') CALL Init_chem_rep_phys(klon_omp,nbp_lev)
 #endif
-    END IF
 
 !$OMP END PARALLEL
@@ -71 +69 @@
 !    CALL Init_dimphy(klon_omp,nbp_lev)
 !
+!#ifdef REPROBUS
 !! Initialization of Reprobus
-!    IF (type_trac == 'repr') THEN
-!#ifdef REPROBUS
-!       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
-!    END IF
 !
 !!$OMP END PARALLEL

LMDZ6/branches/Portage_acc/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_(:)