Changeset 1722 for trunk/LMDZ.TITAN/libf/phytitan/callcorrk.F90

Timestamp:

Jul 18, 2017, 4:15:23 PM (7 years ago)

Author:

jvatant

Message:

Adapt various modifs of LMDZ.GENERIC to LMDZ.TITAN from r1690-1694-1699-1709-1715
--JVO

File:

• trunk/LMDZ.TITAN/libf/phytitan/callcorrk.F90 (modified) (8 diffs)

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

@@ -8 +8 @@
           tau_col,firstcall,lastcall)
 
+      use mod_phys_lmdz_para, only : is_master
       use radinc_h
       use radcommon_h
@@ -17 +18 @@
       USE tracer_h
       use comcstfi_mod, only: pi, mugaz, cpp
-      use callkeys_mod, only: diurnal,tracer,nosurf,        &
+      use callkeys_mod, only: diurnal,tracer,        &
                               strictboundcorrk,specOLR
 
@@ -75 +76 @@
       REAL,INTENT(OUT) :: OSR_nu(ngrid,L_NSPECTV)        ! Outgoing SW radition in each band (Normalized to the band width (W/m2/cm-1).
       REAL,INTENT(OUT) :: tau_col(ngrid)                 ! Diagnostic from aeropacity.
-      REAL,INTENT(OUT) :: albedo_equivalent(ngrid)       ! Spectrally Integrated Albedo. For Diagnostic. By MT2015  
+      REAL,INTENT(OUT) :: albedo_equivalent(ngrid)       ! Spectrally Integrated Albedo. For Diagnostic. By MT2015
       
       
@@ -113 +114 @@
       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).
@@ -167 +168 @@
 
         ! 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...)
@@ -376 +377 @@
             ! 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
@@ -419 +420 @@
             ! 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
@@ -430 +429 @@
             albv(nw)=albedo(ig,nw)
          ENDDO
-
-         if (nosurf) then ! Case with no surface.
-            DO nw=1,L_NSPECTV
-               if(albv(nw).gt.0.0) then
-                  print*,'For open lower boundary in callcorrk must'
-                  print*,'have spectral surface band albedos all set to zero!'
-                  call abort
-               endif
-            ENDDO         
-         endif
 
       if ((ngrid.eq.1).and.(global1d)) then ! Fixed zenith angle 'szangle' in 1D simulations w/ globally-averaged sunlight.