Changeset 1468 for XIOS/dev/branch_openmp/src

Timestamp:

03/27/18 20:40:31 (6 years ago)

Author:

yushan

Message:

tests (client, complete, toy, rempa) work fine with 2-level server mode. Tested on ADA (2*2+2)

Location:

XIOS/dev/branch_openmp/src

Files:

• node/context.cpp (modified) (2 diffs)
• test/test_remap_omp.f90 (modified) (1 diff)

XIOS/dev/branch_openmp/src/node/context.cpp

@@ -257 +257 @@
      
 
-     if (CServer::serverLevel != 1)
+     //if (CServer::serverLevel != 1)
+      if (CServer::serverLevel == 0)
       // initClient is called by client
-     {
+      {
        client = new CContextClient(this, intraComm, interComm, cxtServer);
        if (cxtServer) // Attached mode
@@ -289 +290 @@
        server = new CContextServer(this, intraCommServer, interCommServer);
      }
-     else
+     else if(CServer::serverLevel == 1)
      // initClient is called by primary server
      {

XIOS/dev/branch_openmp/src/test/test_remap_omp.f90

@@ -231 +231 @@
     !CALL xios_recv_field("src_field_curvilinear", tmp_field_1)
     !CALL xios_recv_field("src_field_unstructured", tmp_field_2)
+    CALL xios_recv_field("src_field_regular", tmp_field_0)
+    !CALL xios_recv_field("src_field_curvilinear", tmp_field_1)
+    !CALL xios_recv_field("src_field_unstructured", tmp_field_2)
     CALL xios_update_calendar(ts)