Changeset 837 for trunk/LMDZ.GENERIC/libf/dyn3d

Timestamp:

Nov 10, 2012, 4:55:04 PM (13 years ago)

Author:

aslmd

Message:

LMDZ.GENERIC. Corrected problems with allocated arrays in start2archive and newstart. Applied a workaround to make those work without tracers (-cpp NOTRAC -- perhaps there is a better solution). Checked that everything works in debug mode.

Location:

trunk/LMDZ.GENERIC/libf/dyn3d

Files:

• iniadvtrac.F (modified) (2 diffs)
• lect_start_archive.F (modified) (2 diffs)
• newstart.F (modified) (2 diffs)
• start2archive.F (modified) (2 diffs)

trunk/LMDZ.GENERIC/libf/dyn3d/iniadvtrac.F

@@ -20 +20 @@
       INTEGER :: iq
       INTEGER :: ierr
+
+#ifdef NOTRAC
 
 ! Look for file traceur.def
@@ -137 +139 @@
 c
 
+#endif
 
       end

trunk/LMDZ.GENERIC/libf/dyn3d/lect_start_archive.F

@@ -1256 +1256 @@
 c     write(49,*) 'ucov',vcov
 
+      if (nqmx .gt. 0) then
 c traceurs surface
       do iq = 1, nqmx
@@ -1317 +1318 @@
 ! no need to transfer "co2ice" any more; it is in qsurf(igcm_co2_ice)
 
+      endif !! if nqmx .ne. 0
+
 c-----------------------------------------------------------------------
 c   Initialisation  h:  (passage de t -> h)

trunk/LMDZ.GENERIC/libf/dyn3d/newstart.F

@@ -250 +250 @@
       call initracer(ngridmx,nqmx,tnom)
 
+! Take care of arrays in common modules
+      ! ALLOCATE ARRAYS in surfdat_h (if not already done, e.g. when using start_archive)
+      IF (.not. ALLOCATED(albedodat)) ALLOCATE(albedodat(ngridmx))
+      IF (.not. ALLOCATED(phisfi)) ALLOCATE(phisfi(ngridmx))
+      IF (.not. ALLOCATED(zmea)) ALLOCATE(zmea(ngridmx))
+      IF (.not. ALLOCATED(zstd)) ALLOCATE(zstd(ngridmx))
+      IF (.not. ALLOCATED(zsig)) ALLOCATE(zsig(ngridmx))
+      IF (.not. ALLOCATED(zgam)) ALLOCATE(zgam(ngridmx))
+      IF (.not. ALLOCATED(zthe)) ALLOCATE(zthe(ngridmx))
+      ! ALLOCATE ARRAYS in comsoil_h (if not already done)
+      IF (.not.ALLOCATED(layer))
+     . ALLOCATE(layer(nsoilmx))
+      IF (.not.ALLOCATED(mlayer))
+     . ALLOCATE(mlayer(0:nsoilmx-1))
+      IF (.not.ALLOCATED(inertiedat))
+     . ALLOCATE(inertiedat(ngridmx,nsoilmx))
+      ! ALLOCATE ARRAYS IN comgeomfi_h (done in inifis usually)
+      IF (.not. ALLOCATED(lati)) ALLOCATE(lati(ngridmx))
+      IF (.not. ALLOCATED(long)) ALLOCATE(long(ngridmx))
+      IF (.not. ALLOCATED(area)) ALLOCATE(area(ngridmx))
+      cursor = 1 ! added by AS in dimphys. 1 for sequential runs.
 
 c-----------------------------------------------------------------------
@@ -299 +320 @@
         CALL dynetat0(fichnom,nqmx,vcov,ucov,teta,q,masse,
      .       ps,phis,time)
-
-
-        ! ALLOCATE ARRAYS IN comgeomfi_h (done in inifis usually)
-        IF (.not. ALLOCATED(lati)) ALLOCATE(lati(ngridmx))
-        IF (.not. ALLOCATED(long)) ALLOCATE(long(ngridmx))
-        IF (.not. ALLOCATED(area)) ALLOCATE(area(ngridmx))
-        cursor = 1 ! added by AS in dimphys. 1 for sequential runs.
 
         write(*,*) 'Reading file STARTFI'

trunk/LMDZ.GENERIC/libf/dyn3d/start2archive.F

@@ -20 +20 @@
 
       USE comsoil_h
+      USE comgeomfi_h
 
       implicit none
@@ -123 +124 @@
 
       grireg   = .TRUE.
+      cursor = 1 ! added by AS in dimphys.
+
+      ! ALLOCATE ARRAYS IN comgeomfi_h (usually done in inifis)
+      ! this must be here for start2archive to work
+      IF (.not. ALLOCATED(lati)) ALLOCATE(lati(ngridmx))
+      IF (.not. ALLOCATED(long)) ALLOCATE(long(ngridmx))
+      IF (.not. ALLOCATED(area)) ALLOCATE(area(ngridmx))
 
 c=======================================================================