Changeset 30

Timestamp:

04/15/09 17:55:40 (15 years ago)

Author:

ymipsl

Message:

Ajout de clef CPP USE_OASIS

Location:

XMLIO_SERVER/trunk

Files:

• configure (modified) (1 diff)
• src/IOSERVER/mod_ioclient_para.f90 (modified) (2 diffs)
• src/IOSERVER/mod_ioserver_para.f90 (modified) (4 diffs)

XMLIO_SERVER/trunk/configure

@@ -126 +126 @@
   set INCDIR="$INCDIR $OASIS_INCDIR"
   set LIB="$LIB $OASIS_LIBDIR $OASIS_LIB"
+  set CPP_KEY="$CPP_KEY USE_OASIS"
 endif
 

XMLIO_SERVER/trunk/src/IOSERVER/mod_ioclient_para.f90

@@ -13 +13 @@
   USE mpitrace
   USE mod_ioserver_namelist
+#ifdef USE_OASIS
   USE mod_prism_get_comm  
+#endif
   IMPLICIT NONE
     INCLUDE 'mpif.h'
@@ -33 +35 @@
       oasis_server_id=server_id
       PRINT *,'prism_get_intracomm'
+#ifdef USE_OASIS
       CALL prism_get_intracomm(Comm_client_server,oasis_server_id,ierr)
+#endif
     ELSE
       CALL MPI_INIT(ierr)

XMLIO_SERVER/trunk/src/IOSERVER/mod_ioserver_para.f90

@@ -21 +21 @@
   USE mpitrace
   USE mod_ioserver_namelist
-  USE mod_prism_get_comm  
+#ifdef USE_OASIS
+  USE mod_prism_get_comm 
+#endif 
   IMPLICIT NONE
     INCLUDE 'mpif.h'
@@ -37 +39 @@
        oasis_server_id=server_id
        oasis_client_id=client_id
+#ifdef USE_OASIS
        CALL prism_init_comp_proto (comp_id, oasis_server_id, ierr)
        CALL prism_get_intracomm(Comm_client_server,oasis_client_id,ierr)
+#endif
     ELSE
       CALL MPI_INIT(ierr)
@@ -79 +83 @@
   SUBROUTINE Finalize_parallel
   USE mod_ioserver_namelist
+#ifdef USE_OASIS
   USE mod_prism_proto
+#endif
   IMPLICIT NONE
     include 'mpif.h'
@@ -85 +91 @@
     
     IF (using_oasis) THEN
+#ifdef USE_OASIS
       CALL prism_terminate_proto(ierr)
+#endif
     ELSE
       CALL MPI_FINALIZE(ierr)