Changeset 1380 for LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/gcm.F

Timestamp:

May 6, 2010, 2:24:59 PM (14 years ago)

Author:

Ehouarn Millour

Message:

Minor bug fix: Enable the possiblity to start a Shallow Water run from a start.nc file.

Plus some cleanup in outputs messages (in dyetat0,dynredem and iniconst).

EM

File:

• LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/gcm.F (modified) (1 diff)

LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/gcm.F

@@ -248 +248 @@
           CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
         endif
-!#ifdef CPP_IOIPSL
+
         if (planet_type.eq."earth") then
 #ifdef CPP_EARTH
 ! Load an Earth-format start file
          CALL dynetat0("start.nc",vcov,ucov,
-     .              teta,q,masse,ps,phis, time_0)
-#endif
+     &              teta,q,masse,ps,phis, time_0)
+#endif
+        ! SW model also has Earth-format start files
+        ! (but can be used without the CPP_EARTH directive)
+          if (iflag_phys.eq.0) then
+            CALL dynetat0("start.nc",vcov,ucov,
+     &              teta,q,masse,ps,phis, time_0)
+          endif
+        
         endif ! of if (planet_type.eq."earth")
+        
 c       write(73,*) 'ucov',ucov
 c       write(74,*) 'vcov',vcov