Changeset 2333 for XIOS/dev/dev_ym/XIOS_COUPLING/src/client.cpp

Timestamp:

06/13/22 17:04:55 (2 years ago)

Author:

jderouillat

Message:

Reintroduced oasis_enddef management on the server side (communications are operated on MPI_COMM_WORLD in Oasis). XIOS clients require to initilialize Oasis by themselves first, and then to specify their local_comm to xios_initialize. Coupled components must be specified through clients_code_id in iodef.xml

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/client.cpp (modified) (5 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/client.cpp

@@ -115 +115 @@
       {
         MPI_Comm_dup(localComm,&clientComm) ;
+        MPI_Comm_dup(localComm,&intraComm_) ;
+
+        if (CXios::usingServer)
+        {
+          MPI_Comm_rank(intraComm_,&rank_) ;
+        }
+
       }
       
@@ -244 +251 @@
 
       } 
-      
       MPI_Bcast(&error,1,MPI_INT,0,clientComm) ;
       
@@ -263 +269 @@
           MPI_Intercomm_merge(interComm,high, &intraComm ) ;
           high=false ;
+          if (i==pos) {
+            interComm_=interComm ;
+          }
         }
         xiosGlobalComm=intraComm ;
@@ -308 +317 @@
             high=false ;
           }
+          if (i==pos) {
+            interComm_=interComm ; // NOT TESTED !
+          }
         }
         xiosGlobalComm=intraComm ;
@@ -459 +471 @@
       if (!oasisEnddef) ERROR("void CClient::callOasisEnddef(void)", <<"Function xios_oasis_enddef called but variable <call_oasis_enddef> is set to false."<<endl
                                                                      <<"Variable <call_oasis_enddef> must be set to true"<<endl) ;
-      if (CXios::isServer)
+      if (!CXios::isClient) // != isServer (change recently )
       // Attached mode
       {