Changeset 3998 for LMDZ6/trunk

Timestamp:

Nov 2, 2021, 3:54:30 PM (3 years ago)

Author:

Ehouarn Millour

Message:

Cleanup for tracers. Stop if there is no "traceur.def" file to read, rather than try to guess number and type of tracers.
EM

File:

• LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -219 +219 @@
           write(lunout,*) 'nqtrue=',nqtrue
        ELSE 
-          WRITE(lunout,*) trim(modname),': Problem in opening traceur.def'
-          WRITE(lunout,*) trim(modname),': WARNING using defaut values'
-          IF (planet_type=='earth') THEN
-            nqtrue=4 ! Default value for Earth
-          ELSE
-            nqtrue=1 ! Default value for other planets
-          ENDIF
+          WRITE(lunout,*) trim(modname),': Failed opening traceur.def'
+          CALL abort_gcm(modname,"file traceur.def not found!",1)
        ENDIF
 !jyg<
@@ -251 +246 @@
           READ(90,*) nqo
        ELSE 
-          WRITE(lunout,*) trim(modname),': Using default value for nqo'
-          nqo=2
+          WRITE(lunout,*) trim(modname),': Failed opening traceur.def'
+          CALL abort_gcm(modname,"file traceur.def not found!",1)
        ENDIF
        IF (nqo /= 2 .AND. nqo /= 3 ) THEN
@@ -321 +316 @@
 !---------------------------------------------------------------------
     IF (type_trac == 'lmdz' .OR. type_trac == 'repr' .OR. type_trac == 'coag' .OR. type_trac == 'co2i') THEN
-
-       IF(ierr.EQ.0) THEN
 
           ! Continue to read tracer.def
@@ -370 +363 @@
           CLOSE(90)  
 
-       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
-          tnom_0(1) = 'H2Ov'
-          tnom_transp(1) = 'air'
-          hadv(2) = 10
-          vadv(2) = 10
-          tnom_0(2) = 'H2Ol'
-          tnom_transp(2) = 'air'
-          hadv(3) = 10
-          vadv(3) = 10
-          tnom_0(3) = 'RN'
-          tnom_transp(3) = 'air'
-          hadv(4) = 10
-          vadv(4) = 10
-          tnom_0(4) = 'PB'
-          tnom_transp(4) = 'air'
-         else ! default for other planets
-          hadv(1) = 10
-          vadv(1) = 10
-          tnom_0(1) = 'dummy'
-          tnom_transp(1) = 'dummy'
-         endif ! of if (planet_type=="earth")
-
-       ENDIF
-       
        WRITE(lunout,*) trim(modname),': Valeur de traceur.def :'
        WRITE(lunout,*) trim(modname),': nombre total de traceurs ',nqtrue
@@ -480 +444 @@
 ! et les schemas d'advection associes. excepte pour ceux lus 
 ! dans traceur.def 
-       IF (ierr .eq. 0) then 
 
           DO iq=1,nqo+nqCO2
@@ -530 +493 @@
           CLOSE(90)  
 
-       ELSE  !! if traceur.def doesn't exist 
-
-          tnom_0(1)='H2Ov'
-          tnom_transp(1) = 'air'
-          tnom_0(2)='H2Ol'
-          tnom_transp(2) = 'air'
-          hadv(1) = 10
-          hadv(2) = 10 
-          vadv(1) = 10 
-          vadv(2) = 10 
-
-       ENDIF
  
 #ifdef INCA