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

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

File:

• trunk/LMDZ.MARS/libf/aeronomars/inichim_newstart.F (modified) (4 diffs)

trunk/LMDZ.MARS/libf/aeronomars/inichim_newstart.F

@@ -120 +120 @@
               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
@@ -129 +134 @@
           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
@@ -164 +174 @@
         write(*,*)'inichim_newstart: 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 
@@ -395 +408 @@
       ! as in the old days, water vapour is last and water ice,
       ! if present, is just before water vapour
-      nqchem(1)=igcm_co2
-      nqchem(2)=igcm_co
-      nqchem(3)=igcm_o
-      nqchem(4)=igcm_o1d
-      nqchem(5)=igcm_o2
-      nqchem(6)=igcm_o3
-      nqchem(7)=igcm_h
-      nqchem(8)=igcm_h2
-      nqchem(9)=igcm_oh
-      nqchem(10)=igcm_ho2
-      nqchem(11)=igcm_h2o2
-      nqchem(12)=igcm_n2
-      nqchem(13)=igcm_ar
-      nqchem(14)=igcm_h2o_ice
-      nqchem(15)=igcm_h2o_vap
+      do iq=1,15 ! loop so as to avoid out-of-bounds on array
+      if (iq==1) nqchem(i)=igcm_co2
+      if (iq==2) nqchem(i)=igcm_co
+      if (iq==3) nqchem(i)=igcm_o
+      if (iq==4) nqchem(i)=igcm_o1d
+      if (iq==5) nqchem(i)=igcm_o2
+      if (iq==6) nqchem(i)=igcm_o3
+      if (iq==7) nqchem(i)=igcm_h
+      if (iq==8) nqchem(i)=igcm_h2
+      if (iq==9) nqchem(i)=igcm_oh
+      if (iq==10) nqchem(i)=igcm_ho2
+      if (iq==11) nqchem(i)=igcm_h2o2
+      if (iq==12) nqchem(i)=igcm_n2
+      if (iq==13) nqchem(i)=igcm_ar
+      if (iq==14) nqchem(i)=igcm_h2o_ice
+      if (iq==15) nqchem(i)=igcm_h2o_vap
+      enddo
 
 ! Load in chemistry data for initialization: