Changeset 718

Timestamp:

10/05/15 15:32:52 (8 years ago)

Author:

rlacroix

Message:

Rename "buffer_factor_size" to "buffer_size_factor" to clarify its meaning.

Location:

XIOS/trunk

Files:

• inputs/COMPLETE/iodef.xml (modified) (1 diff)
• inputs/REMAP/iodef.xml (modified) (1 diff)
• inputs/Unstruct/iodef.xml (modified) (1 diff)
• inputs/Version2/iodef.xml (modified) (1 diff)
• inputs/iodef.xml (modified) (1 diff)
• src/cxios.cpp (modified) (2 diffs)
• src/cxios.hpp (modified) (1 diff)
• src/node/grid.cpp (modified) (1 diff)

XIOS/trunk/inputs/COMPLETE/iodef.xml

@@ -10 +10 @@
         <variable_group id="buffer">
             <variable id="optimal_buffer_size" type="string">memory</variable>
-            <variable id="buffer_factor_size" type="double">1.0</variable> 
+            <variable id="buffer_size_factor" type="double">1.0</variable>
          </variable_group>
 

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -72 +72 @@
         <variable_group id="buffer">
             <variable id="optimal_buffer_size" type="string">performance</variable>
-            <variable id="buffer_factor_size" type="double">30.0</variable>
+            <variable id="buffer_size_factor" type="double">30.0</variable>
          </variable_group>
 

XIOS/trunk/inputs/Unstruct/iodef.xml

@@ -35 +35 @@
         <variable_group id="buffer">
             <variable id="optimal_buffer_size" type="string">performance</variable>
-            <variable id="buffer_factor_size" type="double">1.0</variable>
+            <variable id="buffer_size_factor" type="double">1.0</variable>
          </variable_group>
 

XIOS/trunk/inputs/Version2/iodef.xml

@@ -128 +128 @@
         <variable_group id="buffer">
             <variable id="optimal_buffer_size" type="string">performance</variable>
-            <variable id="buffer_factor_size" type="double">1.0</variable>
+            <variable id="buffer_size_factor" type="double">1.0</variable>
          </variable_group>
 

XIOS/trunk/inputs/iodef.xml

@@ -55 +55 @@
         <variable_group id="buffer">
             <variable id="optimal_buffer_size" type="string">performance</variable>
-            <variable id="buffer_factor_size" type="double">1.0</variable>
+            <variable id="buffer_size_factor" type="double">1.0</variable>
          </variable_group>
 

XIOS/trunk/src/cxios.cpp

@@ -24 +24 @@
   bool CXios::usingOasis ;
   bool CXios::usingServer = false;
-  double CXios::bufferServerFactorSize=1.0 ;
-  double CXios::defaultBufferServerFactorSize=1.0 ;
+  double CXios::bufferSizeFactor = 1.0;
+  const double CXios::defaultBufferSizeFactor = 1.0;
   bool CXios::printLogs2Files;
   bool CXios::isOptPerformance = true;
@@ -60 +60 @@
     }
 
-    bufferServerFactorSize=getin<double>("buffer_factor_size",defaultBufferServerFactorSize) ;
+    bufferSizeFactor = getin<double>("buffer_size_factor", defaultBufferSizeFactor);
+
     globalComm=MPI_COMM_WORLD ;
   }

XIOS/trunk/src/cxios.hpp

@@ -40 +40 @@
      static bool usingOasis ; //!< Using Oasis
      static bool usingServer ; //!< Using server (server mode)
-     static double bufferServerFactorSize ; //!< Factor helps tune buffer size
-     static double defaultBufferServerFactorSize ; //!< Default factor value
+     static double bufferSizeFactor; //!< Factor used to tune the buffer size
+     static const double defaultBufferSizeFactor; //!< Default factor value
      static bool isOptPerformance; //!< Check if buffer size is for performance (as large as possible)
      static CRegistry* globalRegistry ; //!< global registry which is wrote by the root process of the servers

XIOS/trunk/src/node/grid.cpp

@@ -86 +86 @@
    std::map<int, StdSize> CGrid::getConnectedServerDataSize()
    {
-     double secureFactor = 2.5 * sizeof(double) * CXios::bufferServerFactorSize;
+     double secureFactor = 2.5 * sizeof(double) * CXios::bufferSizeFactor;
      StdSize retVal = 1;
      std::map<int, StdSize> ret;