Changeset 1384 for LMDZ4/branches/LMDZ4V5.0-dev/libf

Timestamp:

May 7, 2010, 9:07:31 AM (15 years ago)

Author:

Ehouarn Millour

Message:

Restore possibility to start a Shallow Water run from a start.nc file from r1380 which was accidentally removed in r1382

EM

File:

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

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

@@ -274 +274 @@
           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