Changeset 3396

Timestamp:

Sep 26, 2018, 10:36:31 AM (6 years ago)

Author:

idelkadi

Message:

Corrections dans la nouvelle version du simulateur Cosp (cosp2) :

• Rajout de directives OpenMP pour tourner en mod MPI-OpenMP
• Correction pour tourner avec Ioipsl

Location:

LMDZ6/trunk/libf/phylmd/cosp2

Files:

• cosp_config.F90 (modified) (2 diffs)
• cosp_read_otputkeys.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/cosp2/cosp_config.F90

@@ -238 +238 @@
     integer :: &
          numMODISTauBins          ! Number of tau bins for joint-histogram
-    real(wp),allocatable,dimension(:) :: &
+    real(wp),save,allocatable,dimension(:) :: &
          modis_histTau            ! Joint-histogram boundaries (optical depth)
-    real(wp),allocatable,dimension(:,:) :: &
+    !$OMP THREADPRIVATE(modis_histTau)
+    real(wp),save,allocatable,dimension(:,:) :: &
          modis_histTauEdges       ! Joint-histogram bin edges (optical depth)
-    real(wp),allocatable,dimension(:) :: &
+    !$OMP THREADPRIVATE(modis_histTauEdges)
+    real(wp),save,allocatable,dimension(:) :: &
          modis_histTauCenters     ! Joint-histogram bin centers (optical depth)
-    
+    !$OMP THREADPRIVATE(modis_histTauCenters)
     ! ####################################################################################
     ! MODIS simulator tau/ReffICE and tau/ReffLIQ joint-histogram information
@@ -333 +335 @@
     integer :: &
          Nlvgrid      ! Number of levels in New grid
-    real(wp),dimension(:),allocatable,save :: &
-       vgrid_zl,  & ! New grid bottoms
-       vgrid_zu,  & ! New grid tops
-       vgrid_z      ! New grid center
+!    real(wp),dimension(:),allocatable,save : &
+!       vgrid_zl,  & ! New grid bottoms
+!       vgrid_zu,  & ! New grid tops
+!       vgrid_z      ! New grid center
+    REAL(wp), SAVE, ALLOCATABLE :: vgrid_zl(:),vgrid_zu(:),vgrid_z(:)
     !$OMP THREADPRIVATE(vgrid_zl,vgrid_zu,vgrid_z)
 END MODULE MOD_COSP_CONFIG

LMDZ6/trunk/libf/phylmd/cosp2/cosp_read_otputkeys.F90

@@ -496 +496 @@
   cfg%Lmisr_sim  = Lmisr_sim
   cfg%Lrttov_sim = Lrttov_sim
+  cfg%Lparasol_sim = Lparasol_sim
 
   cfg%Lstats = Lstats