Changeset 1446 for LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3dpar/gcm.F

Timestamp:

Oct 22, 2010, 11:27:25 AM (14 years ago)

Author:

Ehouarn Millour

Message:

Implemented modifications to enable running with only one tracer for planet types different from "earth". Rem: If flag 'planet_type' is set to "earth" (default behaviour) then there must be at least 2 tracers for the dynamics to function properly.

These updates do not induce any changes in model outputs with respect to previous revisions.

EM

File:

• LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3dpar/gcm.F (modified) (2 diffs)

LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3dpar/gcm.F

@@ -276 +276 @@
         endif
 
-        if (planet_type.eq."earth") then
-#ifdef CPP_EARTH
+!        if (planet_type.eq."earth") then
 ! Load an Earth-format start file
          CALL dynetat0("start.nc",vcov,ucov,
      &              teta,q,masse,ps,phis, time_0)
-#else
-        ! 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
-        endif ! of if (planet_type.eq."earth")
+!        endif ! of if (planet_type.eq."earth")
+
 c       write(73,*) 'ucov',ucov
 c       write(74,*) 'vcov',vcov
@@ -494 +486 @@
 #endif
 
-      if (planet_type.eq."earth") then
+!      if (planet_type.eq."earth") then
+! Write an Earth-format restart file
         CALL dynredem0_p("restart.nc", day_end, phis)
-      endif
+!      endif
 
       ecripar = .TRUE.