Changeset 2187 for LMDZ5/branches/testing/libf/dyn3dpar

Timestamp:

Jan 30, 2015, 2:57:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2158:2186 into testing branch.

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dpar/gcm.F (modified) (1 diff)
• libf/dyn3dpar/leapfrog_p.F (modified) (1 diff)

LMDZ5/branches/testing/libf/dyn3dpar/gcm.F

@@ -246 +246 @@
      $        iphysiq,day_step,nday, 
      $        nbsrf, is_oce,is_sic,
-     $        is_ter,is_lic)
+     $        is_ter,is_lic, calend)
 
          call init_inca_para(

LMDZ5/branches/testing/libf/dyn3dpar/leapfrog_p.F

@@ -1410 +1410 @@
 c$OMP MASTER
               call fin_getparam
-              call finalize_parallel
+c$OMP END MASTER
+#ifdef INCA
+                 call finalize_inca
+#endif
+c$OMP MASTER
+               call finalize_parallel
 c$OMP END MASTER
               abort_message = 'Simulation finished'