Changeset 1715 for trunk/LMDZ.GENERIC/libf/phystd/callcorrk.F90

Timestamp:

Jun 8, 2017, 1:03:06 AM (8 years ago)

Author:

jvatant

Message:

Cleaning of the radiative code + coherence between optci and optcv :

+ Get rid of the actually dummy and confusing extra level L_LEVELS+1 for aerosols
+ Harmonisation between optci and optcv
+ Get rid of tauref (called nowhere) and csqtly of ini_radcommon subroutine

JVO

File:

• trunk/LMDZ.GENERIC/libf/phystd/callcorrk.F90 (modified) (6 diffs)

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

@@ -123 +123 @@
       REAL*8 taucumi(L_LEVELS,L_NSPECTI,L_NGAUSS)
 
-      REAL*8 tauaero(L_LEVELS+1,naerkind)
+      REAL*8 tauaero(L_LEVELS,naerkind)
       REAL*8 nfluxtopv,nfluxtopi,nfluxtop,fluxtopvdn
       REAL*8 nfluxoutv_nu(L_NSPECTV)                 ! Outgoing band-resolved VI flux at TOA (W/m2).
@@ -189 +189 @@
 
         ! test on allocated necessary because of CLFvarying (two calls to callcorrk in physiq)
-        if(.not.allocated(QXVAER)) allocate(QXVAER(L_LEVELS+1,L_NSPECTV,naerkind))
-        if(.not.allocated(QSVAER)) allocate(QSVAER(L_LEVELS+1,L_NSPECTV,naerkind))
-        if(.not.allocated(GVAER)) allocate(GVAER(L_LEVELS+1,L_NSPECTV,naerkind))
-        if(.not.allocated(QXIAER)) allocate(QXIAER(L_LEVELS+1,L_NSPECTI,naerkind))
-        if(.not.allocated(QSIAER)) allocate(QSIAER(L_LEVELS+1,L_NSPECTI,naerkind))
-        if(.not.allocated(GIAER)) allocate(GIAER(L_LEVELS+1,L_NSPECTI,naerkind))
+        if(.not.allocated(QXVAER)) allocate(QXVAER(L_LEVELS,L_NSPECTV,naerkind))
+        if(.not.allocated(QSVAER)) allocate(QSVAER(L_LEVELS,L_NSPECTV,naerkind))
+        if(.not.allocated(GVAER)) allocate(GVAER(L_LEVELS,L_NSPECTV,naerkind))
+        if(.not.allocated(QXIAER)) allocate(QXIAER(L_LEVELS,L_NSPECTI,naerkind))
+        if(.not.allocated(QSIAER)) allocate(QSIAER(L_LEVELS,L_NSPECTI,naerkind))
+        if(.not.allocated(GIAER)) allocate(GIAER(L_LEVELS,L_NSPECTI,naerkind))
 
          !!! ALLOCATED instances are necessary because of CLFvarying (strategy to call callcorrk twice in physiq...)
@@ -323 +323 @@
      end do !iaer=1,naerkind.
 
+
       ! How much light do we get ?
       do nw=1,L_NSPECTV
@@ -439 +440 @@
             ! Test / Correct for freaky s. s. albedo values.
             do iaer=1,naerkind
-               do k=1,L_LEVELS+1
+               do k=1,L_LEVELS
 
                   do nw=1,L_NSPECTV
@@ -482 +483 @@
             ! boundary conditions
             tauaero(1,iaer)          = tauaero(2,iaer)
-            tauaero(L_LEVELS+1,iaer) = tauaero(L_LEVELS,iaer)
             !tauaero(1,iaer)          = 0.
-            !tauaero(L_LEVELS+1,iaer) = 0.
             
          end do ! naerkind
@@ -574 +573 @@
 
       if(kastprof)then
-      
-         if(.not.global1d)then ! garde-fou/safeguard added by MT (to be removed in the future)
-            write(*,*) 'You have to fix mu0, '
-            write(*,*) 'the cosinus of the solar angle'
-            stop
-         endif
-         
+
          ! Initial values equivalent to mugaz.
          DO l=1,nlayer