Changeset 164 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Jun 17, 2011, 10:49:17 AM (14 years ago)

Author:

emillour

Message:

Mars GCM:

Updates and corrections (to enable compiling/running in debug mode with

ifort)

• removed option "-free-form" from makegcm_ifort and set mod_loc_dir="." so that module files (produced in local directory by ifort) are moved to LIBO
• updated initracer.F, physdem1.F, physiq.F, inichim_newstart.F to avoid referencing out-of-bound array indexes (even if unused)
• cosmetic updates on inwrite.F, datareadnc.F
• updated newstart.F to initialize and use 'datadir' when looking for files
• corrected bug on interpolation of sub-surface temperatures in lect_start_archive.F

EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• datareadnc.F (modified) (1 diff)
• initracer.F (modified) (3 diffs)
• iniwrite.F (modified) (1 diff)
• physdem1.F (modified) (1 diff)
• physiq.F (modified) (3 diffs)

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

@@ -123 +123 @@
         write(*,*)'1) You can set this path in the callphys.def file:'
         write(*,*)'   datadir=/path/to/the/datafiles'
-        write(*,*)'2) If necessary surface.nc (and other datafiles)'
+        write(*,*)'   OR specify the path to use in callphys.def, as:'
+        write(*,*)'   datadir=/path/to/the/directory'
+        write(*,*)'2) If necessary, surface.nc (and other datafiles)'
         write(*,*)'   can be obtained online on:'
         write(*,*)' http://www.lmd.jussieu.fr/~forget/datagcm/datafile'

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

@@ -111 +111 @@
               write(*,*) 'initracer: error expected dustbin=2'
             else
-              noms(1)='dust_mass'   ! dust mass mixing ratio
-              noms(2)='dust_number' ! dust number mixing ratio
+!              noms(1)='dust_mass'   ! dust mass mixing ratio
+!              noms(2)='dust_number' ! dust number mixing ratio
+! same as above, but avoid explict possible out-of-bounds on array
+               noms(1)='dust_mass'   ! dust mass mixing ratio
+               do iq=2,2
+               noms(iq)='dust_number' ! dust number mixing ratio
+               enddo
             endif
           endif
@@ -120 +125 @@
           noms(nqmx)='h2o_vap'
           mmol(nqmx)=18.
-          noms(nqmx-1)='h2o_ice'
-          mmol(nqmx-1)=18.
+!            noms(nqmx-1)='h2o_ice'
+!            mmol(nqmx-1)=18.
+          !"loop" to avoid potential out-of-bounds in array
+          do iq=nqmx-1,nqmx-1
+            noms(iq)='h2o_ice'
+            mmol(iq)=18.
+          enddo
         endif
         ! 3. Chemistry
@@ -157 +167 @@
       if (oldnames.and.water) then
         write(*,*)'initracer: moving surface water ice to index ',nqmx-1
-        qsurf(1:ngridmx,nqmx-1)=qsurf(1:ngridmx,nqmx)
+        ! "loop" to avoid potential out-of-bounds on arrays
+        do iq=nqmx-1,nqmx-1
+          qsurf(1:ngridmx,iq)=qsurf(1:ngridmx,iq+1)
+        enddo
         qsurf(1:ngridmx,nqmx)=0
       endif 

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

@@ -36 +36 @@
 c   ----------
 
-      integer nid        ! NetCDF file ID
-      INTEGER*4 idayref  ! date (initial date for this run)
-      REAL phis(ip1jmp1) ! surface geopotential
+      integer,intent(in) :: nid        ! NetCDF file ID
+      INTEGER*4,intent(in) :: idayref  ! date (initial date for this run)
+      real,intent(in) :: phis(ip1jmp1) ! surface geopotential
 
 c   Local:

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

@@ -565 +565 @@
         ! back to qsurf(nqmx)
         IF (water) THEN
+          !"loop" to avoid potential out-of-bounds on arrays
           write(*,*)'physdem1: moving surface water ice to index ',nqmx
-          qsurf(1:ngridmx,nqmx)=qsurf(1:ngridmx,nqmx-1)
-          qsurf(1:ngridmx,nqmx-1)=0
+          do iq=nqmx,nqmx
+          qsurf(1:ngridmx,iq)=qsurf(1:ngridmx,iq-1)
+          qsurf(1:ngridmx,iq-1)=0
+          enddo
         ENDIF
       endif ! of if (count.eq.nqmx)

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

@@ -1308 +1308 @@
 c        call WRITEDIAGFI(ngrid,"emis","Surface emissivity","w.m-1",2,
 c    &                  emis)
-         call WRITEDIAGFI(ngrid,"pplay","Pressure","Pa",3,zplay)
-         call WRITEDIAGFI(ngrid,"pplev","Pressure","Pa",3,zplev)
+!         call WRITEDIAGFI(ngrid,"pplay","Pressure","Pa",3,zplay)
+!         call WRITEDIAGFI(ngrid,"pplev","Pressure","Pa",3,zplev)
          call WRITEDIAGFI(ngrid,"tsurf","Surface temperature","K",2,
      &                  tsurf)
          call WRITEDIAGFI(ngrid,"ps","surface pressure","Pa",2,ps)
-c        call WRITEDIAGFI(ngrid,"co2ice","co2 ice thickness","kg.m-2",2,
-c    &                  co2ice)
+        call WRITEDIAGFI(ngrid,"co2ice","co2 ice thickness","kg.m-2",2,
+     &                  co2ice)
 c         call WRITEDIAGFI(ngrid,"temp7","temperature in layer 7",
 c     &                  "K",2,zt(1,7))
@@ -1331 +1331 @@
          call WRITEDIAGFI(ngrid,"rho","density","none",3,rho)
 c        call WRITEDIAGFI(ngrid,"q2","q2","kg.m-3",3,q2)
-        call WRITEDIAGFI(ngrid,'Teta','T potentielle','K',3,zh)
+!        call WRITEDIAGFI(ngrid,'Teta','T potentielle','K',3,zh)
 c        call WRITEDIAGFI(ngrid,"pressure","Pressure","Pa",3,pplay)
 c        call WRITEDIAGFI(ngrid,"ssurf","Surface stress","N.m-2",2,
@@ -1536 +1536 @@
      &                  zq(ig,l,1)*(pplev(ig,l)-pplev(ig,l+1))/g
          if (nqmx .gt. 1) then
+             iq=2 ! to avoid out-of-bounds spotting by picky compilers
+                  ! when gcm is compiled with only one tracer
              dummycol(ig)=dummycol(ig)+
-     &                  zq(ig,l,2)*(pplev(ig,l)-pplev(ig,l+1))/g
+     &                  zq(ig,l,iq)*(pplev(ig,l)-pplev(ig,l+1))/g
          endif
          enddo