Changeset 6124 for LMDZ6/trunk/libf

Timestamp:

Mar 23, 2026, 11:31:30 PM (2 weeks ago)

Author:

lguez

Message:

Upgrade read_climoz

To variable of module conf_phys_m.

Location:

LMDZ6/trunk/libf

Files:

• dynphy_lonlat/phylmd/etat0phys_netcdf.f90 (modified) (3 diffs)
• phylmd/conf_phys_m.f90 (modified) (2 diffs)
• phylmd/physiq_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.f90

@@ -91 +91 @@
   USE regr_horiz_time_climoz_m, ONLY: regr_horiz_time_climoz
   USE indice_sol_mod
-  USE conf_phys_m, ONLY: conf_phys
+  USE conf_phys_m, ONLY: conf_phys, read_climoz
   USE init_ssrf_m, ONLY: start_init_subsurf
   USE phys_state_var_mod, ONLY: beta_aridity, delta_tsurf, awake_dens, cv_gen, &
@@ -128 +128 @@
   !LOGICAL :: flag_bc_internal_mixture
   !REAL    :: bl95_b0, bl95_b1
-  INTEGER :: read_climoz                        !--- Read ozone climatology
   LOGICAL :: filtre_oro=.false.
 
@@ -137 +136 @@
 ! Physics configuration
 !*******************************************************************************
-  CALL conf_phys( read_climoz )
+  CALL conf_phys
   CALL phys_state_var_init(read_climoz)
 

LMDZ6/trunk/libf/phylmd/conf_phys_m.f90

@@ -56 +56 @@
     !$OMP THREADPRIVATE(alp_offset)
 
-
+    INTEGER, SAVE, protected:: read_climoz ! read ozone climatology
+    !     Allowed values are 0, 1 and 2
+    !     0: do not read an ozone climatology
+    !     1: read a single ozone climatology that will be used day and night
+    !     2: read two ozone climatologies, the average day and night
+    !     climatology and the daylight climatology
+    !$OMP THREADPRIVATE(read_climoz)
 
 CONTAINS
 
-  SUBROUTINE conf_phys( read_climoz )
+  SUBROUTINE conf_phys
 
         USE compbl_mod_h
@@ -121 +127 @@
     ! PC
     ! Per-gas routing switches (Concentration "effective")
-
-    INTEGER, INTENT(OUT):: read_climoz ! read ozone climatology, OpenMP shared
-    ! Allowed values are 0, 1 and 2
-    ! 0: do not read an ozone climatology
-    ! 1: read a single ozone climatology that will be used day and night
-    ! 2: read two ozone climatologies, the average day and night
-    ! climatology and the daylight climatology
 
     !-----------------------------------------------------------------

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -67 +67 @@
     USE conf_phys_m , ONLY : aerosol_couple
     USE conf_phys_m , ONLY : chemistry_couple
-    USE conf_phys_m , ONLY : flag_aerosol
+    USE conf_phys_m , ONLY : flag_aerosol, read_climoz
     USE conf_phys_m , ONLY : flag_bc_internal_mixture
     USE conf_phys_m , ONLY : solarlong0,alp_offset,flag_aer_feedback,flag_aerosol_strat
@@ -1063 +1063 @@
     ! VARIABLES RELATED TO OZONE CLIMATOLOGIES
     ! Note that pressure vectors are in Pa and in stricly ascending order
-    INTEGER,SAVE :: read_climoz                ! Read ozone climatology
-    !     Allowed values are 0, 1 and 2
-    !     0: do not read an ozone climatology
-    !     1: read a single ozone climatology that will be used day and night
-    !     2: read two ozone climatologies, the average day and night
-    !     climatology and the daylight climatology
     INTEGER,SAVE :: ncid_climoz                ! NetCDF file identifier
     REAL, ALLOCATABLE, SAVE :: press_cen_climoz(:) ! Pressure levels
     REAL, ALLOCATABLE, SAVE :: press_edg_climoz(:) ! Edges of pressure intervals
     REAL, ALLOCATABLE, SAVE :: time_climoz(:)      ! Time vector
-    !$OMP THREADPRIVATE(read_climoz, ncid_climoz, press_cen_climoz)
+    !$OMP THREADPRIVATE(ncid_climoz, press_cen_climoz)
     !$OMP THREADPRIVATE(press_edg_climoz, time_climoz)
 
@@ -1265 +1259 @@
        !
        !     appel a la lecture du run.def physique
-       CALL conf_phys( read_climoz )
+       CALL conf_phys
 
        CALL init_etat0_limit_unstruct