Changeset 1234 for XIOS/dev/XIOS_DEV_CMIP6/src/node/file.cpp

Timestamp:

08/03/17 15:16:56 (7 years ago)

Author:

oabramkina

Message:

Minor modifications for secondary server:

• adding a check of the number of processes requested for the secondary server
• making process distribution between two server levels in case of oasis similar to that wihtout oasis.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/file.cpp (modified) (3 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/file.cpp

@@ -17 +17 @@
 #include "mpi.hpp"
 #include "timer.hpp"
+#include "server.hpp"
 
 namespace xios {
@@ -302 +303 @@
       // Done by classical server or secondary server
       // This condition should be changed soon
-      if (!CXios::usingServer2 || (CXios::usingServer2 && !context->hasClient))          
+      if (CServer::serverLevel == 0 || CServer::serverLevel == 2)
       {
         if (mode.isEmpty() || mode.getValue() == mode_attr::write)
@@ -326 +327 @@
       // Done by classical server or secondary server
       // TODO: This condition should be changed soon. It only works with maximum number of level as 2
-      if (!CXios::usingServer2 || (CXios::usingServer2 && context->hasClient))
+      if (CServer::serverLevel == 0 || CServer::serverLevel == 2)
       {
         if (!mode.isEmpty() && mode.getValue() == mode_attr::read)