Changeset 475 for XIOS

Timestamp:

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

Author:

aclsce

Message:

Modified to use Oasis-MCT coupler in coupled mode.

Location:

XIOS/trunk

Files:

• arch/arch-GCC_LINUX.path (modified) (1 diff)
• arch/arch-GCC_MACOSX.path (modified) (1 diff)
• arch/arch-PW6_VARGAS.path (modified) (1 diff)
• arch/arch-X64_ADA.path (modified) (1 diff)
• arch/arch-X64_CURIE.path (modified) (1 diff)
• arch/arch-X64_CURIE_GCC.path (modified) (1 diff)
• arch/arch-X64_CURIE_PGI.path (modified) (1 diff)
• arch/arch-X64_CURIE_VAMPIR.path (modified) (1 diff)
• arch/arch-X64_HORUS.path (modified) (1 diff)
• arch/arch-X64_JADE.path (modified) (1 diff)
• arch/arch-X64_TITANE.path (modified) (1 diff)
• arch/arch-X64_TITANE_VAMPIR.path (modified) (1 diff)
• arch/arch-XE6_LYNX.path (modified) (1 diff)
• bld.cfg (modified) (1 diff)
• make_xios (modified) (4 diffs)
• src/interface/c/oasis_cinterface.cpp (modified) (1 diff)
• src/interface/c/oasis_cinterface.hpp (modified) (2 diffs)
• src/interface/fortran/oasis_interface.F90 (modified) (10 diffs)
• src/server.cpp (modified) (1 diff)

XIOS/trunk/arch/arch-GCC_LINUX.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz"
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-GCC_MACOSX.path

@@ -7 +7 @@
 HDF5_LIB=""
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-PW6_VARGAS.path

@@ -11 +11 @@
 MPI_LIB=""
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-X64_ADA.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz"
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-X64_CURIE.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl"
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
 
 #only for MEMTRACK debuging : developper only

XIOS/trunk/arch/arch-X64_CURIE_GCC.path

@@ -11 +11 @@
 HDF5_LIB=""
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-X64_CURIE_PGI.path

@@ -11 +11 @@
 HDF5_LIB=""
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-X64_CURIE_VAMPIR.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl"
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-X64_HORUS.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz"
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-X64_JADE.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz"
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-X64_TITANE.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl"
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-X64_TITANE_VAMPIR.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl"
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/arch/arch-XE6_LYNX.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lz -lcurl"
 
-OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
-OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
-OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"

XIOS/trunk/bld.cfg

@@ -55 +55 @@
 bld::excl_dep        use::mod_prism_get_localcomm_proto
 bld::excl_dep        use::mod_prism_proto
+bld::excl_dep        use::mod_prism
 bld::excl_dep        inc::mpif.h

XIOS/trunk/make_xios

@@ -4 +4 @@
 compil_full="false"
 use_oasis="false"
+oasis="oasis3_mct"
 use_memtrack="false"
 job="1"
@@ -23 +24 @@
             echo "       [--avail] : to know available target architectures "
             echo "       [--full] : to generate dependencies and recompile from scratch"
-            echo "       [--use_oasis] : to use Oasis coupler"
+            echo "       [--use_oasis 'oasis3' 'oasis3_mct' : default oasis3_mct] : to use Oasis coupler"
             echo "       [--doc] : to generate Doxygen documentation (not available yet)"
             echo "       [--job ntasks] : to use parallel compilation with ntasks"
@@ -37 +38 @@
          "--avail") ls arch/*.fcm | cut -d"-" -f2 | cut -d"." -f1 ; exit ;; 
          "--full")  compil_full="true"  ; shift ;;
-         "--use_oasis")  use_oasis="true"  ; shift  ;;
+         "--use_oasis")  use_oasis="true" oasis=$2 ; shift ; shift  ;;
          "--doc")   doc="true"          ; shift ;;
          "--job")   job=$2              ; shift ; shift ;;
@@ -130 +131 @@
 if [[ "$use_oasis" == "true" ]]
    then
-   NETCDF_LIB="-lnetcdff -lnetcdf"
-   XMLIO_FINCDIR="$OASIS_INCDIR $XMLIO_FINCDIR"
-   XMLIO_LIB="$OASIS_LIBDIR $OASIS_LIB $XMLIO_LIB"
-   XMLIO_CPPKEY="$XMLIO_CPPKEY USE_OASIS"
+    if [[ "$oasis" == "oasis3_mct" ]]
+    then
+        XMLIO_CPPKEY="$XMLIO_CPPKEY USE_OMCT"
+    elif [[ "$oasis" == "oasis3"  ]]
+    then
+        XMLIO_CPPKEY="$XMLIO_CPPKEY USE_OASIS"
+        OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
+        OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
+        OASIS_LIB="-lpsmile.MPI1 -lmpp_io"
+    else
+        echo "Bad choice for --use_oasis argument : choose between 'oasis3','oasis3_mct'"
+        exit
+    fi
+    NETCDF_LIB="-lnetcdff -lnetcdf"
+    XMLIO_FINCDIR="$OASIS_INCDIR $XMLIO_FINCDIR"
+    XMLIO_LIB="$OASIS_LIBDIR $OASIS_LIB $XMLIO_LIB"
 fi 
 

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

XIOS/trunk/src/server.cpp

@@ -118 +118 @@
           interComm.push_back(newComm) ;
         }
+        oasis_enddef() ;
       }