Changeset 66 for trunk/libf/dyn3dpar/parallel.F90

Timestamp:

Feb 16, 2011, 4:57:45 PM (14 years ago)

Author:

emillour

Message:

EM: Mise a niveau par rapport a la version terrestre (LMDZ5V2.0-dev, rev 1487)

• Mise a jour des scripts (terrestres) 'makegcm' et 'create_make_gcm'
• Ajout du script 'makelmdz' (version "amelioree", en Bash, de makegcm)
• Mise a jour des routines dans phylmd (sauf regr_lat_time_climoz_m.F)

• disvert (dans dyn3d et dyn3dpar): passage au Fortran 90
• parallel.F90 (dyn3dpar): correction bug
• etat0_netcdf.F90 (dyn3d et dyn3dpar) : mise a jour mineure
• ce0l.F90 (dyn3dpar) : correction bug
• abort_gcm.F (dyn3dpar) : correction bug
• ugeostr.F90 (dyn3d et dyn3dpar) : passage au Fortran 90
• fluxstokenc_p.F (dyn3dpar) : correction bug
• iniacademic.F90 (dyn3d et dyn3dpar) : passage au Fortran 90
• friction_p.F (dyn3dpar) : correction bug
• infotrac.F90 (dyn3d et dyn3dpar) : correction bug mineur sur lecture traceurs
• caladvtrac.F (dyn3d) : modifications cosmetiques

File:

• trunk/libf/dyn3dpar/parallel.F90 (modified) (3 diffs)

trunk/libf/dyn3dpar/parallel.F90

@@ -1 +1 @@
 ! 
-! $Id: parallel.F90 1279 2009-12-10 09:02:56Z fairhead $
+! $Id: parallel.F90 1487 2011-02-11 15:07:54Z jghattas $
 !
   module parallel
   USE mod_const_mpi
     
-    LOGICAL,SAVE :: using_mpi
+    LOGICAL,SAVE :: using_mpi=.TRUE.
     LOGICAL,SAVE :: using_omp
     
@@ -208 +208 @@
       integer :: ierr
       integer :: i
-      deallocate(jj_begin_para)
-      deallocate(jj_end_para)
-      deallocate(jj_nb_para)
+
+      if (allocated(jj_begin_para)) deallocate(jj_begin_para)
+      if (allocated(jj_end_para))   deallocate(jj_end_para)
+      if (allocated(jj_nb_para))    deallocate(jj_nb_para)
 
       if (type_ocean == 'couple') then
@@ -549 +550 @@
         
    
-    /*  
-  Subroutine verif_hallo(Field,ij,ll,up,down)
-    implicit none
-#include "dimensions.h"
-#include "paramet.h"    
-    include 'mpif.h'
-    
-      INTEGER :: ij,ll
-      REAL, dimension(ij,ll) :: Field
-      INTEGER :: up,down 
-      
-      REAL,dimension(ij,ll): NewField
-      
-      NewField=0
-      
-      ijb=ij_begin
-      ije=ij_end
-      if (pole_nord) 
-      NewField(ij_be       
-*/
+!  Subroutine verif_hallo(Field,ij,ll,up,down)
+!    implicit none
+!#include "dimensions.h"
+!#include "paramet.h"    
+!    include 'mpif.h'
+!    
+!      INTEGER :: ij,ll
+!      REAL, dimension(ij,ll) :: Field
+!      INTEGER :: up,down 
+!      
+!      REAL,dimension(ij,ll): NewField
+!      
+!      NewField=0
+!      
+!      ijb=ij_begin
+!      ije=ij_end
+!      if (pole_nord) 
+!      NewField(ij_be       
+
   end module parallel