Changeset 565 for trunk

Timestamp:

Mar 7, 2012, 3:43:52 PM (13 years ago)

Author:

acolaitis

Message:

Update to pbl_parameter so that several values of z_out can be sought in one pass. Pbl_parameter can also now be called when calltherm=false, as long as callrichsl=true.

File:

• trunk/LMDZ.MARS/libf/phymars/inifis.F (modified) (3 diffs)

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

@@ -249 +249 @@
      $              "1-> new correction",
      $              "(matters only if callnirco2=T)"
-         nircorr=1      !default value
+         nircorr=0      !default value
          call getin("nircorr",nircorr)
          write(*,*) " nircorr = ",nircorr
@@ -290 +290 @@
          endif
 
+#ifndef MESOSCALE
          if (calladj .and. callrichsl .and. (.not. calltherm)) then
           print*,'You should not be calling the convective adjustment
@@ -300 +301 @@
           stop
          endif
-
+#endif
          write(*,*) "call CO2 condensation ?"
          callcond=.true. ! default value