Changeset 2793 for trunk/LMDZ.TITAN/libf/phytitan

Timestamp:

Sep 2, 2022, 4:04:28 PM (2 years ago)

Author:

emillour

Message:

Titan physics:
Fix some OpenMP typos and inconsistencies spoted when compiling (even without OpenMP) on Irene.
Some further run-time checking in debug mode might be needed to ensure everything is indeed OK for OpenMP.
EM

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• callkeys_mod.F90 (modified) (1 diff)
• comchem_h.F90 (modified) (2 diffs)
• iostart.F90 (modified) (1 diff)
• muphy_diag.F90 (modified) (1 diff)
• phys_state_var_mod.F90 (modified) (1 diff)

trunk/LMDZ.TITAN/libf/phytitan/callkeys_mod.F90

@@ -15 +15 @@
 !$OMP THREADPRIVATE(strictboundcorrk)
       logical,save :: corrk_recombin
-!$OMP_THREADPRIVATE(corrk_recombin)
+!$OMP THREADPRIVATE(corrk_recombin)
       logical,save :: seashaze,uncoupl_optic_haze
 !$OMP THREADPRIVATE(seashaze,uncoupl_optic_haze)

trunk/LMDZ.TITAN/libf/phytitan/comchem_h.F90

@@ -63 +63 @@
    INTEGER, SAVE :: nlaykim_up   ! Number of upper atm. layers for chemistry from GCM top to 4.5E-5 Pa (1300km)
    INTEGER, SAVE :: nlaykim_tot  ! Number of total layers for chemistry from surface to 4.5E-5 Pa (1300km)
-!$OMP_THREADPRIVATE(nlaykim_up,nlay_kim_tot)
+!$OMP THREADPRIVATE(nlaykim_up,nlaykim_tot)
 
    ! NB : For the startfile we use nlaykim_up grid (upper atm) and for outputs we use nlaykim_tot grid (all layers)
@@ -78 +78 @@
    REAL,SAVE,ALLOCATABLE,DIMENSION(:,:,:) :: ykim_tot     ! Total chemistry fields (mol/mol)
    
-!$OMP_THREADPRIVATE(preskim,zlaykim,ykim_up)
-!$OMP_THREADPRIVATE(preskim_tot,zlaykim_tot,ykim_tot)
+!$OMP THREADPRIVATE(preskim,zlaykim,ykim_up)
+!$OMP THREADPRIVATE(preskim_tot,zlaykim_tot,ykim_tot)
 
    ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

trunk/LMDZ.TITAN/libf/phytitan/iostart.F90

@@ -17 +17 @@
     INTEGER,SAVE :: idim8 ! "upper_chemistry_layers" dimension
     INTEGER,SAVE :: timeindex ! current time index (for time-dependent fields)
-!$OMP THREADPRIVATE(idim1,idim2,idim3,idim4,idim5,idim6,idim7,idim8,idim9,timeindex)
+!$OMP THREADPRIVATE(idim1,idim2,idim3,idim4,idim5,idim6,idim7,idim8,timeindex)
     INTEGER,PARAMETER :: length=100 ! size of tab_cntrl array
     

trunk/LMDZ.TITAN/libf/phytitan/muphy_diag.F90

@@ -24 +24 @@
   REAL(kind=8), ALLOCATABLE, DIMENSION(:,:)   :: mmd_rc_cld     !! Cloud drop radius (m).
 
-  !$OMP THREADPRIVATE(mmd_aer_prec,mmd_ccnprec,mmd_aer_s_flux,mmd_aer_f_flux,mmd_ccn_flux,mmd_ice_fluxes)
+  !$OMP THREADPRIVATE(mmd_aer_prec,mmd_ccn_prec,mmd_aer_s_flux,mmd_aer_f_flux,mmd_ccn_flux,mmd_ice_fluxes)
   !$OMP THREADPRIVATE(mmd_gazs_sat,mmd_ice_prec,mmd_rc_sph,mmd_rc_fra,mmd_rc_cld)
 

trunk/LMDZ.TITAN/libf/phytitan/phys_state_var_mod.F90

@@ -46 +46 @@
       real,dimension(:),allocatable,save :: fluxgrd     ! Surface conduction flux (W.m-2).
       real,dimension(:,:),allocatable,save :: qsurf     ! Tracer on surface (e.g. kg.m-2).
-!$OMP THREADPRIVATE(emis,dtrad,fluxrad_sky,fluxrad,capcal,fluxgrd,qsurf,q2)
+!$OMP THREADPRIVATE(emis,dtrad,fluxrad_sky,fluxrad,capcal,fluxgrd,qsurf)
 
       ! FOR DIAGNOSTIC :