Changeset 837 for trunk/LMDZ.GENERIC/libf

Timestamp:

Nov 10, 2012, 4:55:04 PM (12 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

Files:

• dyn3d/iniadvtrac.F (modified) (2 diffs)
• dyn3d/lect_start_archive.F (modified) (2 diffs)
• dyn3d/newstart.F (modified) (2 diffs)
• dyn3d/start2archive.F (modified) (2 diffs)
• phystd/datareadnc.F (modified) (2 diffs)
• phystd/for_lmdz5/README.aymeric (modified) (1 diff)
• phystd/surfini.F (modified) (1 diff)

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=======================================================================

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

@@ -232 +232 @@
      .         iim, jjp1, rlonv, rlatu, zmea,zstd,zsig,zgam,zthe)
 
-          CALL dump2d(iip1,jjp1,zmea,'zmea')
-          CALL dump2d(iip1,jjp1,zstd,'zstd')
-          CALL dump2d(iip1,jjp1,zsig,'zsig')
-          CALL dump2d(iip1,jjp1,zgam,'zgam')
-          CALL dump2d(iip1,jjp1,zthe,'zthe')
+          !CALL dump2d(iip1,jjp1,zmea,'zmea')
+          !CALL dump2d(iip1,jjp1,zstd,'zstd')
+          !CALL dump2d(iip1,jjp1,zsig,'zsig')
+          !CALL dump2d(iip1,jjp1,zgam,'zgam')
+          !CALL dump2d(iip1,jjp1,zthe,'zthe')
 
       endif
@@ -295 +295 @@
             phisinit(i)=1000.*phisinit(i)
       ENDDO
-      CALL dump2d(iimp1,jjp1,phisinit,'Altitude en m')
+      !CALL dump2d(iimp1,jjp1,phisinit,'Altitude en m')
       CALL multscal(iimp1*jjp1,phisinit,g,phisinit)
 

trunk/LMDZ.GENERIC/libf/phystd/for_lmdz5/README.aymeric

@@ -40 +40 @@
 
 
+/home/spiga/MODELES/LMDZ.GENERIC/makegcm -d 64x48x20 -t 0 -debug -cpp NOTRAC start2archive > logcomp
+
+/home/spiga/MODELES/LMDZ.GENERIC/makegcm -d 64x48x20 -t 0 newstart
+
+/home/spiga/MODELES/LMDZ.GENERIC/makegcm -d 128x96x20 -t 0 -debug -cpp NOTRAC newstart
+
+/home/spiga/MODELES/LMDZ.GENERIC/makegcm -d 64x48x20 -t 0 -s 1 -b 3x2 gcm
+
+
 pour initialisation idealisee, qqch comme iniaqua dans phyaqua ???

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

@@ -57 +57 @@
         DO ig=1,ngrid
           IF (qsurf(ig,igcm_co2_ice) .GT. 0.) THEN
+             !!!! no good in parallel
              IF(ig.GT.ngrid/2+1) THEN
                 icap=2