Changeset 1279 for LMDZ4/trunk/libf/dyn3dpar/parallel.F90

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/dyn3dpar/parallel.F90 (modified) (7 diffs)

LMDZ4/trunk/libf/dyn3dpar/parallel.F90

@@ +1 @@
+! 
+! $Id$
+!
   module parallel
   USE mod_const_mpi
@@ -33 +36 @@
 #include "dimensions.h"
 #include "paramet.h"
-    
+#include "iniprint.h"
+
       integer :: ierr
       integer :: i,j
@@ -83 +87 @@
         if (jj_nb_para(i) <= 2 ) then
           
-         print *,"Arret : le nombre de bande de lattitude par process est trop faible (<2)."
-         print *," ---> diminuez le nombre de CPU ou augmentez la taille en lattitude"
+         write(lunout,*)"Arret : le nombre de bande de lattitude par process est trop faible (<2)."
+         write(lunout,*)" ---> diminuez le nombre de CPU ou augmentez la taille en lattitude"
           
 #ifdef CPP_MPI
@@ -127 +131 @@
       endif
         
-      print *,"jj_begin",jj_begin
-      print *,"jj_end",jj_end
-      print *,"ij_begin",ij_begin
-      print *,"ij_end",ij_end
+      write(lunout,*)"init_parallel: jj_begin",jj_begin
+      write(lunout,*)"init_parallel: jj_end",jj_end
+      write(lunout,*)"init_parallel: ij_begin",ij_begin
+      write(lunout,*)"init_parallel: ij_end",ij_end
 
 !$OMP PARALLEL
@@ -185 +189 @@
     use mod_prism_proto
 #endif
+#ifdef CPP_EARTH
+! Ehouarn: surface_data module is in 'phylmd' ...
       use surface_data, only : type_ocean
       implicit none
+#else
+      implicit none
+! without the surface_data module, we declare (and set) a dummy 'type_ocean'
+      character(len=6),parameter :: type_ocean="dummy"
+#endif
+! #endif of #ifdef CPP_EARTH
 
       include "dimensions.h"
@@ -415 +427 @@
     implicit none
 #include "dimensions.h"
-#include "paramet.h"    
+#include "paramet.h" 
+#include "iniprint.h"
 #ifdef CPP_MPI
     include 'mpif.h'
@@ -436 +449 @@
            call Pack_Data(Field(ij_begin,1),ij,ll,min(jj_end,jjm)-jj_begin+1,Buffer_send)
         else
-           print *,ij  
+           write(lunout,*)ij  
         stop 'erreur dans Gather_Field'
         endif