Changeset 3360 for trunk/LMDZ.GENERIC

Timestamp:

Jun 5, 2024, 12:30:04 PM (7 months ago)

Author:

emillour

Message:

Generic PCM:
OpenMP fix in newsedim, add a missing THREADPRIVATE for "molrad" variable.
While at it make sedim and callsedim modules.
EM

Location:

trunk/LMDZ.GENERIC

Files:

• changelog.txt (modified) (1 diff)
• libf/phystd/callsedim.F (modified) (3 diffs)
• libf/phystd/newsedim.F (modified) (4 diffs)
• libf/phystd/physiq_mod.F90 (modified) (1 diff)

trunk/LMDZ.GENERIC/changelog.txt

@@ -1953 +1953 @@
 - adapt "ocean_slab_get_vars" routine to also return sea ice temperature
 - add some missing OpenMP THREADPRIVATE on saved variables in ocean_slab_mod.
+
+== 05/06/2024 == EM
+OpenMP fix in newsedim, add a missing THREADPRIVATE for "molrad" variable.
+While at it make sedim and callsedim modules.

trunk/LMDZ.GENERIC/libf/phystd/callsedim.F

@@ +1 @@
+      MODULE callsedim_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+      
       SUBROUTINE callsedim(ngrid,nlay, ptimestep,
      &                pplev,zlev, pt, pdt,
@@ -9 +15 @@
       use comcstfi_mod, only: g
       use callkeys_mod, only : water
+      use newsedim_mod, only: newsedim
 
       IMPLICIT NONE
@@ -154 +161 @@
        endif ! of no gases no co2_ice
       enddo ! of do iq=1,nq
-      return
-      end
+
+      END SUBROUTINE callsedim
+      
+      END MODULE callsedim_mod

trunk/LMDZ.GENERIC/libf/phystd/newsedim.F

@@ +1 @@
+      MODULE newsedim_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+
       SUBROUTINE newsedim(ngrid,nlay,naersize,ptimestep,
      &  pplev,masse,epaisseur,pt,rd,rho,pqi,wq,iq)
@@ -4 +10 @@
       use ioipsl_getin_p_mod, only: getin_p
       use comcstfi_mod, only: r, g
-      use gases_h
+      use gases_h, only: gfrac, gnom, ngasmx
+      use gases_h, only: igas_CH4, igas_CO2, igas_H2, igas_H2O
+      use gases_h, only: igas_He, igas_N2
       use tracer_h, only : igcm_h2o_ice
       use watercommon_h, only: T_h2O_ice_liq,T_h2O_ice_clouds     
@@ -69 +77 @@
 c     Effective gas molecular radius (m)
       real,save :: molrad
+!$OMP THREADPRIVATE(molrad)
 
 c     local and saved variable
@@ -282 +291 @@
 c    &                wq(1,6),wq(1,7),pqi(1,6)
 
-      END
+      END SUBROUTINE newsedim
+      
+      END MODULE newsedim_mod

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

@@ -85 +85 @@
       use turbdiff_mod, only: turbdiff
       use turb_mod, only : q2,sensibFlux,turb_resolved
+      use callsedim_mod, only: callsedim
       use mass_redistribution_mod, only: mass_redistribution
       use condensation_generic_mod, only: condensation_generic