Changeset 475 for XIOS/trunk/src/interface

Timestamp:

02/11/14 13:29:57 (10 years ago)

Author:

aclsce

Message:

Modified to use Oasis-MCT coupler in coupled mode.

Location:

XIOS/trunk/src/interface

Files:

• c/oasis_cinterface.cpp (modified) (1 diff)
• c/oasis_cinterface.hpp (modified) (2 diffs)
• fortran/oasis_interface.F90 (modified) (10 diffs)

XIOS/trunk/src/interface/c/oasis_cinterface.cpp

@@ -16 +16 @@
   }
   
+  void oasis_enddef(void)
+  {
+    fxios_oasis_enddef() ;
+  }
+
   void oasis_get_localcomm(MPI_Comm& comm)
   {

XIOS/trunk/src/interface/c/oasis_cinterface.hpp

@@ -8 +8 @@
 
   void fxios_oasis_init(const char* server_id,int str_len) ;
+  void fxios_oasis_enddef(void) ;
   void fxios_oasis_finalize(void) ;
   void fxios_oasis_get_localcomm(MPI_Fint* f_comm) ;
@@ -17 +18 @@
 {
   void oasis_init(const std::string& server_id) ;
+  void oasis_enddef(void) ;
   void oasis_finalize(void) ;
   void oasis_get_localcomm(MPI_Comm& comm) ;

XIOS/trunk/src/interface/fortran/oasis_interface.F90

@@ -3 +3 @@
 #ifdef USE_OASIS
   USE mod_prism_proto
+#endif
+#ifdef USE_OMCT
+  USE mod_prism
 #endif
     CHARACTER(kind = C_CHAR),DIMENSION(*) :: server_id
@@ -16 +19 @@
     ENDDO
 
-#ifdef USE_OASIS
-    CALL prism_init_comp_proto (comp_id, oasis_server_id, ierr)
+#if defined USE_OASIS || defined USE_OMCT
+     CALL prism_init_comp_proto (comp_id, oasis_server_id, ierr)
 #endif
     PRINT *,"---> prism_init",oasis_server_id,ierr
@@ -23 +26 @@
 END SUBROUTINE fxios_oasis_init
 
+SUBROUTINE fxios_oasis_enddef() BIND(C,NAME="fxios_oasis_enddef")
+  USE, INTRINSIC :: ISO_C_BINDING
+#ifdef USE_OMCT
+  USE mod_prism
+#endif
+  IMPLICIT NONE
+  INTEGER :: ierr
+#ifdef USE_OMCT
+     CALL prism_enddef_proto(ierr)
+#endif
+
+END SUBROUTINE fxios_oasis_enddef
 
 SUBROUTINE fxios_oasis_finalize() BIND(C,NAME="fxios_oasis_finalize")
@@ -29 +44 @@
   USE mod_prism_proto
 #endif
+#ifdef USE_OMCT
+  USE mod_prism
+#endif
   IMPLICIT NONE
   INTEGER :: ierr
   
-#ifdef USE_OASIS
+#if defined USE_OASIS || defined USE_OMCT
     CALL prism_terminate_proto(ierr)
 #endif
@@ -42 +60 @@
   USE, INTRINSIC :: ISO_C_BINDING
 #ifdef USE_OASIS
-!  USE mod_prism_get_localcomm_proto 
+  USE mod_prism_get_localcomm_proto 
 #endif
+#ifdef USE_OMCT
+  USE mod_prism
+#endif 
   IMPLICIT NONE
   INTEGER(kind=C_INT) :: f_comm
@@ -50 +71 @@
   INTEGER :: ierr
     
-#ifdef USE_OASIS
+#if defined USE_OASIS || defined USE_OMCT
     CALL prism_get_localcomm_proto(comm,ierr)
 #endif
@@ -64 +85 @@
 #ifdef USE_OASIS
   USE mod_prism_get_comm 
+#endif
+#ifdef USE_OMCT
+  USE mod_prism
 #endif
   IMPLICIT NONE
@@ -79 +103 @@
     ENDDO
     
-#ifdef USE_OASIS
+#if defined USE_OASIS || defined USE_OMCT
     CALL prism_get_intracomm(comm_client_server,oasis_client_id,ierr)
 #endif
@@ -91 +115 @@
 #ifdef USE_OASIS
   USE mod_prism_get_comm 
+#endif
+#ifdef USE_OMCT
+  USE mod_prism
 #endif
   IMPLICIT NONE
@@ -106 +133 @@
     ENDDO
     
-#ifdef USE_OASIS
+#if defined USE_OASIS || defined USE_OMCT
     CALL prism_get_intercomm(comm_client_server,oasis_client_id,ierr)
 #endif