Changeset 1921 for LMDZ5/branches/testing/libf/phy1d/lmdz1d.F

Timestamp:

Dec 20, 2013, 10:04:40 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1909:1920 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phy1d/lmdz1d.F (modified) (3 diffs)

LMDZ5/branches/testing/libf/phy1d/lmdz1d.F

@@ -266 +266 @@
 !             initial profile from GCSS file
 !             LS convergence imposed from GCSS file
+!forcing_type = 50 ==> forcing_fire = .true.
+!             forcing from fire.nc
 !forcing_type = 59 ==> forcing_sandu = .true.
 !             initial profiles from sanduref file: see prof.inp.001
@@ -297 +299 @@
       elseif (forcing_type .eq.40) THEN
        forcing_GCSSold = .true.
+      elseif (forcing_type .eq.50) THEN
+       forcing_fire = .true.
       elseif (forcing_type .eq.59) THEN
        forcing_sandu   = .true.
@@ -818 +822 @@
 
        fcoriolis=2.*sin(rpi*xlat/180.)*romega
-       if (forcing_radconv) then
+       if (forcing_radconv .or. forcing_fire) then
          fcoriolis=0.0
          dt_cooling=0.0