Changeset 1775 for trunk

Timestamp:

Aug 27, 2017, 8:58:01 AM (7 years ago)

Author:

aslmd

Message:

LMDZ.MARS setting the stage for maybe fixing nesting in the LMD_MM_MARS 4. ensure arrays not allocated in read_dust_scenario if already allocated -- other changes are useful comments for subsequent developments

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• aeropacity_mod.F (modified) (2 diffs)
• aeroptproperties.F (modified) (3 diffs)
• nlthermeq.F (modified) (1 diff)
• read_dust_scenario.F90 (modified) (1 diff)

trunk/LMDZ.MARS/libf/phymars/aeropacity_mod.F

@@ -160 +160 @@
 ! identify tracers
 
+      !! AS: firstcall OK absolute
       IF (firstcall) THEN
         ! identify scatterers that are dust
@@ -186 +187 @@
 
 c       typical profile of solsir and (1-w)^(-1):
+c       --- purely for diagnostics and printing
         msolsir(1:nlayer,1:naerkind)=0
         mqextsqabs(1:nlayer,1:naerkind)=0

trunk/LMDZ.MARS/libf/phymars/aeroptproperties.F

@@ -188 +188 @@
 c     Creating the effective radius and variance grid
 c     -----------------------------------------------
+!     AS: OK firstcall absolute
       IF (firstcall) THEN
+ 
 c       0.0 Allocate all local saved arrays:
         allocate(refftab(refftabsize,naerkind,2))
@@ -241 +243 @@
 
         allocate(checkgrid(refftabsize,nuefftabsize,naerkind,2))
-        checkgrid(1:refftabsize,1:nuefftabsize,1:naerkind,1:2) = .false.
 
         allocate(logvratgrid(naerkind,2))
@@ -249 +250 @@
 
         allocate(varyingnueff(naerkind))
+
+        checkgrid(1:refftabsize,1:nuefftabsize,1:naerkind,1:2) = .false.
         varyingnueff(1:naerkind) = .false.
 

trunk/LMDZ.MARS/libf/phymars/nlthermeq.F

@@ -30 +30 @@
 c     with no topography location would vary, but this is only
 c     needed for an estimate so any point would do in that case.
+!!    AS: can be problem w MESOSCALE nesting (ignored for the moment)
          igpmax = ismax(ngrid, pplev, 1)
          write(*, 10) ptrans

trunk/LMDZ.MARS/libf/phymars/read_dust_scenario.F90

@@ -118 +118 @@
 
 
-   allocate(tautes(lonlen,latlen,timelen))
-   allocate(lat(latlen), lon(lonlen), time(timelen))
+   if (.not.allocated(tautes)) allocate(tautes(lonlen,latlen,timelen))
+   if (.not.allocated(lat)) allocate(lat(latlen), lon(lonlen), time(timelen))
 
    ! "dustop" if loading visible extinction opacity