Changeset 861 for trunk/LMDZ.GENERIC

Timestamp:

Jan 10, 2013, 9:46:08 PM (12 years ago)

Author:

aslmd

Message:

LMDZ.GENERIC

• Fixed an allocating bug which arises from previous modifications owing to the double use of callcorrk with CLF_varying
• Fixed a small bug in a diagnostic in the end of calc_rayleigh. Some picky compilers complain.
• Fixed a small bug with the array noms which is not allocated when tracer is false. But still need in physdem1.

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/calc_rayleigh.F90 (modified) (2 diffs)
• libf/phystd/callcorrk.F90 (modified) (2 diffs)
• libf/phystd/initracer.F (modified) (1 diff)
• libf/phystd/physiq.F90 (modified) (4 diffs)

trunk/LMDZ.GENERIC/README

@@ -852 +852 @@
   have the full (naerkind size) array of aerosol radii.
 - cleanup (addition of intent(..) to routine arguments) in various routines
+
+== 10/01/2013 == AS
+- Fixed an allocating bug which arises from previous modifications 
+  owing to the double use of callcorrk with CLF_varying
+- Fixed a small bug in a diagnostic in the end of calc_rayleigh. Some picky compilers complain.
+- Fixed a small bug with the array noms which is not allocated when tracer is false. But still need in physdem1.

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

@@ -44 +44 @@
       real*8 tauconsti(ngasmx)
       real*8 tauvari(ngasmx)
+
+      integer icantbewrong
 
       ! tau0/p0=tau/p (Hansen 1974)
@@ -145 +147 @@
 
       IF (L_NSPECTV > 6) THEN
-        print*,'At 1 atm and lambda = ',WAVEV(L_NSPECTV-6),' um'
-        print*,'tau_R = ',TAURAY(L_NSPECTV-6)*1013.25
-        print*,'sig_R = ',TAURAY(L_NSPECTV-6)*g*mugaz*1.67e-27*100, &
+        icantbewrong = L_NSPECTV-6
+        print*,'At 1 atm and lambda = ',WAVEV(icantbewrong),' um'
+        print*,'tau_R = ',TAURAY(icantbewrong)*1013.25
+        print*,'sig_R = ',TAURAY(icantbewrong)*g*mugaz*1.67e-27*100, &
                'cm^2 molecule^-1'
       ENDIF

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

@@ -195 +195 @@
       if(firstcall) then
 
-         ALLOCATE(QREFvis3d(ngrid,nlayermx,naerkind))
-         ALLOCATE(QREFir3d(ngrid,nlayermx,naerkind))
+         !!! ALLOCATED instances are necessary because of CLFvarying
+         !!! strategy to call callcorrk twice in physiq...
+         IF(.not.ALLOCATED(QREFvis3d)) ALLOCATE(QREFvis3d(ngrid,nlayermx,naerkind))
+         IF(.not.ALLOCATED(QREFir3d)) ALLOCATE(QREFir3d(ngrid,nlayermx,naerkind))
+         ! Effective radius and variance of the aerosols
+         IF(.not.ALLOCATED(reffrad)) allocate(reffrad(ngrid,nlayer,naerkind))
+         IF(.not.ALLOCATED(nueffrad)) allocate(nueffrad(ngrid,nlayer,naerkind))
 
          call system('rm -f surf_vals_long.out')
-
-!--------------------------------------------------
-!     Effective radius and variance of the aerosols
-         allocate(reffrad(ngrid,nlayer,naerkind))
-         allocate(nueffrad(ngrid,nlayer,naerkind))
 
          if(naerkind.gt.4)then
@@ -812 +812 @@
         IF( ALLOCATED( wrefvar ) ) DEALLOCATE( wrefvar )
         IF( ALLOCATED( pfgasref ) ) DEALLOCATE( pfgasref )
+        IF ( ALLOCATED(reffrad)) DEALLOCATE(reffrad)
+        IF ( ALLOCATED(nueffrad)) DEALLOCATE(nueffrad)
       endif
 

trunk/LMDZ.GENERIC/libf/phystd/initracer.F

@@ -54 +54 @@
        !! we allocate once for all arrays in common in tracer_h.F90
        !! (supposedly those are not used before call to initracer)
-       ALLOCATE(noms(nq))
+       IF (.NOT.ALLOCATED(noms)) ALLOCATE(noms(nq))
        ALLOCATE(mmol(nq))
        ALLOCATE(radius(nq))

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

@@ -475 +475 @@
 !        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          tracerdyn=tracer
+         IF (.NOT.ALLOCATED(noms)) ALLOCATE(noms(nq)) !! because noms is an argument of physdem1
+                                                      !! whether or not tracer is on
          if (tracer) then
             call initracer(ngrid,nq,nametrac)
@@ -1586 +1588 @@
                     cloudfrac,totcloudfrac,hice,noms)
          endif
+
 
 !        -----------------------------------------------------------------
@@ -1767 +1770 @@
       endif
 
-
       icount=icount+1
 
@@ -1854 +1856 @@
         IF ( ALLOCATED(coslon)) DEALLOCATE(coslon)
 
+
       endif