Changeset 1267 for trunk/LMDZ.GENERIC/libf/phystd

Timestamp:

May 19, 2014, 10:22:08 AM (11 years ago)

Author:

emillour

Message:

Generic model:
Some cleanup on the no tracer case for the 1D model rcm1d.
EM

File:

• trunk/LMDZ.GENERIC/libf/phystd/rcm1d.F (modified) (3 diffs)

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

@@ -249 +249 @@
             allocate(dqdyn(nlayermx,nq))
           else
-            allocate(tname(1)) ! tname(1) is used below, even if nq=0
+            write(*,*) "rcm1d: Error. You set tracer=.true."
+            write(*,*) "       but # of tracers in traceur.def is ",nq
+            stop
           endif
         
@@ -273 +275 @@
            endif
          enddo
-         !if (i_co2_ice==0) then
-         !  write(*,*) "rcm1d: error, we need a 'co2_ice' tracer"
-         !  write(*,*) "   (add one to traceur.def)"
-         !  stop
-         !endif
         else
           write(*,*) 'Cannot find required file "traceur.def"'
@@ -286 +283 @@
         close(90)
 
-      else
-       nq=nqtot
-       if (nq>0) then
-            allocate(tname(nq))
-            allocate(q(nlayermx,nq))
-            allocate(qsurf(nq))
-            allocate(dq(nlayermx,nq))
-            allocate(dqdyn(nlayermx,nq))
-        else
-            allocate(tname(1)) ! tname(1) is used below, even if nq=0
-        endif
+      else ! of if (tracer)
+        nqtot=0
+        nq=0
+        ! still, make allocations for 1 dummy tracer
+        allocate(tname(1)) 
+        allocate(qsurf(1))
+        allocate(q(nlayermx,1))
+        allocate(dq(nlayermx,1))
+      
        ! Check that tracer boolean is compliant with number of tracers
        ! -- otherwise there is an error (and more generally we have to be consistent)
-       if (.not.tracer .and. nq .ge. 1) then
+       if (nq .ge. 1) then
           write(*,*) "------------------------------"
           write(*,*) "rcm1d: You set tracer=.false."
-          write(*,*) " But compiled with 1 tracer or more"
+          write(*,*) " But set number of tracers to ",nq
           write(*,*) " > If you want tracers, set tracer=.true."
-          write(*,*) " > If you do not want tracers, compile with -t 0"
           write(*,*) "------------------------------"
           stop
        endif
-       ! we still need to set (dummy) tracer names for physdem1
-        do iq=1,nq
-          write(str7,'(a1,i2.2)')'q',iq
-          tname(iq)=str7
-        enddo
-        ! actually, we'll need at least one "co2_ice" tracer
-        ! (for surface CO2 ice)
-        i_co2_ice=1
-        tname(i_co2_ice)="co2_ice"
       endif ! of if (tracer)