Changeset 884

Timestamp:

Feb 1, 2008, 1:17:58 PM (16 years ago)

Author:

Laurent Fairhead

Message:

Modifs pour faire tourner le meme executable en force ou couple JG
LF

Location:

LMDZ4/trunk/libf/dyn3dpar

Files:

• mod_const_para.F90 (modified) (1 diff)
• parallel.F90 (modified) (2 diffs)

LMDZ4/trunk/libf/dyn3dpar/mod_const_para.F90

@@ -8 +8 @@
 
   SUBROUTINE Init_const_mpi
-  IMPLICIT NONE
+    USE IOIPSL
+
+    IMPLICIT NONE
     INCLUDE 'mpif.h'
-    INTEGER :: ierr
-    INTEGER :: comp_id
-  
+    INTEGER             :: ierr
+    INTEGER             :: comp_id
+    CHARACTER(len = 6)  :: ocean
+
+!$OMP MASTER
+    ocean = 'force '
+    CALL getin('OCEAN', ocean)
+!$OMP END
+
+    IF (ocean=='couple') THEN
 #ifdef CPP_COUPLE
-       call prism_init_comp_proto (comp_id, 'lmdz.x', ierr)
-       call prism_get_localcomm_proto(COMM_LMDZ,ierr)
-#else      
-      call MPI_INIT(ierr)
-      COMM_LMDZ=MPI_COMM_WORLD
+       CALL prism_init_comp_proto (comp_id, 'lmdz.x', ierr)
+       CALL prism_get_localcomm_proto(COMM_LMDZ,ierr)
 #endif
+    ELSE
+       CALL MPI_INIT(ierr)
+       COMM_LMDZ=MPI_COMM_WORLD
+    END IF
 
     MPI_REAL_LMDZ=MPI_REAL8

LMDZ4/trunk/libf/dyn3dpar/parallel.F90

@@ -137 +137 @@
     use mod_prism_proto
 #endif
-    implicit none
-
-#include "dimensions.h"
-#include "paramet.h"
+      use surface_data, only : ocean
+      implicit none
+
+      include "dimensions.h"
+      include "paramet.h"
       integer :: ierr
       integer :: i
@@ -149 +150 @@
       deallocate(jj_nb_para)
 
+      if (ocean == 'couple') then
 #ifdef CPP_COUPLE
-     call prism_terminate_proto(ierr)
-     IF (ierr .ne. PRISM_Ok) THEN
-       call abort_gcm('Finalize_parallel',' Probleme dans prism_terminate_proto ',1)
-     endif
-#else         
-      call MPI_FINALIZE(ierr)
-#endif
+         call prism_terminate_proto(ierr)
+         IF (ierr .ne. PRISM_Ok) THEN
+            call abort_gcm('Finalize_parallel',' Probleme dans prism_terminate_proto ',1)
+         endif
+#endif 
+      else
+         call MPI_FINALIZE(ierr)
+      end if
       
     end subroutine Finalize_parallel