Changeset 1448

Timestamp:

Nov 2, 2010, 9:35:59 AM (14 years ago)

Author:

Ehouarn Millour

Message:

Small bug fix in the way the traceur.def file is read : using a fixed format for reading that file is not a good idea (things are easily misread), using a free format makes more sense.
Added default initialization for planets (1 tracer) when there is no traceur.def file.

EM

Location:

LMDZ5/branches/LMDZ5V1.0-dev/libf

Files:

• dyn3d/infotrac.F90 (modified) (4 diffs)
• dyn3dpar/infotrac.F90 (modified) (4 diffs)

LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3d/infotrac.F90

@@ -105 +105 @@
           WRITE(lunout,*) trim(modname),': Problem in opening traceur.def'
           WRITE(lunout,*) trim(modname),': WARNING using defaut values'
-          nqtrue=4 ! Defaut value
+          if (planet_type=='earth') then
+            nqtrue=4 ! Default value for Earth
+          else
+            nqtrue=1 ! Default value for other planets
+          endif
        END IF
        if ( planet_type=='earth') then
@@ -162 +166 @@
           ! Continue to read tracer.def
           DO iq=1,nqtrue
-             READ(90,999) hadv(iq),vadv(iq),tnom_0(iq)
+             READ(90,*) hadv(iq),vadv(iq),tnom_0(iq)
           END DO
           CLOSE(90)  
-       ELSE ! Without tracer.def, set default values (for Earth!)
-         if ((nqtrue==4).and.(planet_type=="earth")) then
+       ELSE ! Without tracer.def, set default values 
+         if (planet_type=="earth") then
+          ! for Earth, default is to have 4 tracers
           hadv(1) = 14
           vadv(1) = 14
@@ -179 +184 @@
           vadv(4) = 10
           tnom_0(4) = 'PB'
-         else
-           ! Error message, we need a traceur.def file
-           write(lunout,*) trim(modname),&
-           ': Cannot set default tracer names!'
-           write(lunout,*) trim(modname),' Make a traceur.def file!!!'
-           CALL abort_gcm('infotrac_init','Need a traceur.def file!',1)
-         endif ! of if (nqtrue==4)
+         else ! default for other planets
+          hadv(1) = 10
+          vadv(1) = 10
+          tnom_0(1) = 'dummy'
+         endif ! of if (planet_type=="earth")
        END IF
        
@@ -345 +348 @@
     DEALLOCATE(tracnam)
 
-999 FORMAT (i2,1x,i2,1x,a15)
-
   END SUBROUTINE infotrac_init
 

LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3dpar/infotrac.F90

@@ -105 +105 @@
           WRITE(lunout,*) trim(modname),': Problem in opening traceur.def'
           WRITE(lunout,*) trim(modname),': WARNING using defaut values'
-          nqtrue=4 ! Defaut value
+          if (planet_type=='earth') then
+            nqtrue=4 ! Default value for Earth
+          else
+            nqtrue=1 ! Default value for other planets
+          endif
        END IF
        if ( planet_type=='earth') then
@@ -162 +166 @@
           ! Continue to read tracer.def
           DO iq=1,nqtrue
-             READ(90,999) hadv(iq),vadv(iq),tnom_0(iq)
+             READ(90,*) hadv(iq),vadv(iq),tnom_0(iq)
           END DO
           CLOSE(90)  
-       ELSE ! Without tracer.def, set default values (for Earth!)
-         if ((nqtrue==4).and.(planet_type=="earth")) then
+       ELSE ! Without tracer.def, set default values 
+         if (planet_type=="earth") then
+          ! for Earth, default is to have 4 tracers
           hadv(1) = 14
           vadv(1) = 14
@@ -179 +184 @@
           vadv(4) = 10
           tnom_0(4) = 'PB'
-         else
-           ! Error message, we need a traceur.def file
-           write(lunout,*) trim(modname),&
-           ': Cannot set default tracer names!'
-           write(lunout,*) trim(modname),' Make a traceur.def file!!!'
-           CALL abort_gcm('infotrac_init','Need a traceur.def file!',1)
-         endif ! of if (nqtrue==4)
+         else ! default for other planets
+          hadv(1) = 10
+          vadv(1) = 10
+          tnom_0(1) = 'dummy'
+         endif ! of if (planet_type=="earth")
        END IF
        
@@ -345 +348 @@
     DEALLOCATE(tracnam)
 
-999 FORMAT (i2,1x,i2,1x,a15)
-
   END SUBROUTINE infotrac_init