Changeset 1792 for trunk/LMDZ.TITAN/libf

Timestamp:

Oct 5, 2017, 12:15:17 PM (7 years ago)

Author:

jvatant

Message:

+ Found a bug for the limit cases in disr_haze leading to uninit. value.

Fixed by init to zero but should be relooked at.

+ Also added omp instructions in disr_haze
--JVO

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• disr_haze.F90 (modified) (2 diffs)
• optci.F90 (modified) (1 diff)
• optcv.F90 (modified) (2 diffs)

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

@@ -32 +32 @@
 real*8              :: tmp_p, fact_t
 integer,parameter   :: nbwl_PL=328, nblev_PL=162
-real*8,save         :: ext_PL(nblev_PL,nbwl_PL), ssa_PL(nblev_PL,nbwl_PL)
-real*8,save         :: asf_PL(nblev_PL,nbwl_PL)
+real*8,save         :: ext_PL(nblev_PL,nbwl_PL), ssa_PL(nblev_PL,nbwl_PL), asf_PL(nblev_PL,nbwl_PL)
 real*8,save         :: wl_PL(nbwl_PL), press_PL(nblev_PL)
 logical,save        :: firstcall=.true.
 character(len=15)   :: dummy
+
+!$OMP THREADPRIVATE(ext_PL,ssa_PL,asf_PL,wl_PL,press_PL,firstcall)
 
 if (firstcall) then
@@ -130 +131 @@
      fact_t = log10( ( ext_PL(ip,iw)*(1.-factw) + ext_PL(ip,iw+1)  *factw )   & 
            / ( ext_PL(ip-5,iw)*(1.-factw) + ext_PL(ip-5,iw+1)  *factw ) )
+           
+     taeros = ext_PL(ip,iw)*(1.-factw) + ext_PL(ip,iw+1)  *factw
 
   else if (iw.eq.nbwl_PL) then
 
-     fact_t = log10( ext_PL(ip,iw) / ext_PL(ip-5,iw) )  
+     fact_t = log10( ext_PL(ip,iw) / ext_PL(ip-5,iw) )
+    
+     taeros = ext_PL(ip,iw)
 
   endif

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

@@ -86 +86 @@
   ENDIF
 
+  ! Some initialisation beacause there's a pb with disr_haze at the limits (nw=1)
+  ! I should check this - For now we set vars to zero : better than nans - JVO 2017
+  
+  dhaze_t(:,:) = 0.
+  ssa_t(:,:) = 0.
+  asf_t(:,:) = 0.
+
   !=======================================================================
   !     Determine the total gas opacity throughout the column, for each

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

@@ -94 +94 @@
       indv = -9999 ! this initial value means "to be calculated"
   ENDIF
+  
+  ! Some initialisation beacause there's a pb with disr_haze at the limits (nw=1)
+  ! I should check this - For now we set vars to zero : better than nans - JVO 2017
+  
+  dhaze_t(:,:) = 0.
+  ssa_t(:,:) = 0.
+  asf_t(:,:) = 0.
+
 
   !=======================================================================
@@ -135 +143 @@
 
         !================= Titan customisation ========================================
-        call disr_haze(dz(k),plev(k),wnov(nw),dhaze_T(k,nw),SSA_T(k,nw),ASF_T(k,nw))
+        call disr_haze(dz(k),plev(k),wnov(nw),dhaze_T(k,nw),SSA_T(k,nw),ASF_T(k,nw))
         ! =============================================================================
-
+         
         DRAYAER = TRAY(K,NW)
         !     DRAYAER is Tau RAYleigh scattering, plus AERosol opacity