Changeset 1397 for LMDZ4/branches

Timestamp:

Jun 2, 2010, 2:57:39 PM (14 years ago)

Author:

Ehouarn Millour

Message:

Enable starting a SW run from a start.nc file.

Also fix (for picky compilers) the fact that the last argument of init_phys_lmdz must be an array (of a single element in seq mode).

EM

Location:

LMDZ4/branches/LMDZ4V5.0-dev/libf

Files:

• dyn3d/gcm.F (modified) (4 diffs)
• dyn3dpar/gcm.F (modified) (3 diffs)

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

@@ -184 +184 @@
       if (planet_type.eq."earth") then
 #ifdef CPP_EARTH
-      CALL Init_Phys_lmdz(iim,jjp1,llm,1,(jjm-1)*iim+2)
+      CALL Init_Phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
       call InitComgeomphy
 #endif
@@ -244 +244 @@
       if (read_start) then
       ! we still need to run iniacademic to initialize some
-      ! constants & fields, if we run the 'newtonian' case:
-        if (iflag_phys.eq.2) then
+      ! constants & fields, if we run the 'newtonian' or 'SW' cases:
+        if (iflag_phys.ne.1) then
           CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
         endif
@@ -254 +254 @@
          CALL dynetat0("start.nc",vcov,ucov,
      &              teta,q,masse,ps,phis, time_0)
-#endif
+#else
         ! SW model also has Earth-format start files
         ! (but can be used without the CPP_EARTH directive)
@@ -261 +261 @@
      &              teta,q,masse,ps,phis, time_0)
           endif
-        
+#endif
         endif ! of if (planet_type.eq."earth")
         

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

@@ -270 +270 @@
       if (read_start) then
       ! we still need to run iniacademic to initialize some
-      ! constants & fields, if we run the 'newtonian' case:
-        if (iflag_phys.eq.2) then
+      ! constants & fields, if we run the 'newtonian' or 'SW' cases:
+        if (iflag_phys.ne.1) then
           CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
         endif
@@ -280 +280 @@
          CALL dynetat0("start.nc",vcov,ucov,
      &              teta,q,masse,ps,phis, time_0)
-#endif
+#else
         ! SW model also has Earth-format start files
         ! (but can be used without the CPP_EARTH directive)
@@ -287 +287 @@
      &              teta,q,masse,ps,phis, time_0)
           endif
-        
+#endif
         endif ! of if (planet_type.eq."earth")
 c       write(73,*) 'ucov',ucov