Changeset 2535

Timestamp:

07/21/23 14:42:15 (10 months ago)

Author:

jderouillat

Message:

Backport [2448,2503,2516], ocean component in generic_testcase, memory_report option and nvertex name

Location:

XIOS3/trunk

Files:

• generic_testcase/context_oce.xml (modified) (4 diffs)
• src/client.cpp (modified) (1 diff)
• src/cxios.cpp (modified) (2 diffs)
• src/cxios.hpp (modified) (1 diff)
• src/io/nc4_data_output.cpp (modified) (1 diff)
• src/mem_checker.cpp (modified) (1 diff)
• src/server.cpp (modified) (1 diff)

XIOS3/trunk/generic_testcase/context_oce.xml

@@ -315 +315 @@
  <file_definition  type="one_file" >
     
-    <file id="atm_output" output_freq="1ts" type="one_file" enabled="true">
-      <field field_ref="field3D" />
-      <field field_ref="field2D" /> 
+    <file id="oce_output" output_freq="1ts" type="one_file" enabled="true">
       <field field_ref="pressure"  /> 
       <field field_ref="field3D_resend" /> 
@@ -325 +323 @@
       <field field_ref="field_X"    enabled="true"/>
       <field field_ref="field_Y"    enabled="true"/>
-      <field field_ref="field_XY "  enabled="true"/>
+      <field field_ref="field_XY"   enabled="true"/>
       <field field_ref="field_Z"    enabled="true"/>
       <field field_ref="field_XYZ"  enabled="true"/>
@@ -332 +330 @@
     </file>
 
-    <file id="atm_output_other" output_freq="1ts" type="one_file" enabled="false">
+    <file id="oce_output_other" output_freq="1ts" type="one_file" enabled="false">
        <field field_ref="other_field3D"   enabled="true"/>
        <field field_ref="other_field2D"   enabled="true"/> 
@@ -344 +342 @@
     </file>
 
-    <file id="atm_output_W" output_freq="1ts" enabled="false">
+    <file id="oce_output_W" output_freq="1ts" enabled="false">
        <field field_ref="field3D_W"  enabled="true"/>
        <field field_ref="field2D_W"  enabled="true"/> 

XIOS3/trunk/src/client.cpp

@@ -536 +536 @@
       report(0)<< " Memory report : increasing it by a factor will increase performance, depending of the volume of data wrote in file at each time step of the file"<<endl ;
       report(100)<<CTimer::getAllCumulatedTime()<<endl ;
-      report(100)<<CMemChecker::getAllCumulatedMem()<<endl ;
+      if (CXios::reportMemory)
+      {
+        report(100)<<CMemChecker::getAllCumulatedMem()<<endl ;
+      }
       CWorkflowGraph::drawWorkFlowGraph_client();
 

XIOS3/trunk/src/cxios.cpp

@@ -58 +58 @@
   bool CXios::checkSumSend=false ;
   bool CXios::logMemory=false ;
+  bool CXios::reportMemory=true ;
 
   CDaemonsManager*    CXios::daemonsManager_=nullptr ;
@@ -129 +130 @@
     checkSumSend = getin<bool>("checksum_send_fields", false);
     checkSumRecv = getin<bool>("checksum_recv_fields", false);
-    
+
     logMemory = getin<bool>("log_memory", false);
+    reportMemory = getin<bool>("memory_report", true);
 
     globalComm=MPI_COMM_WORLD ;

XIOS3/trunk/src/cxios.hpp

@@ -68 +68 @@
      static bool checkSumRecv; //!< For debugging, compute a checksum of fields received by the model through the XIOS client
 
-     static bool logMemory; //!< Activate memory monitoring for all XIOS process
-    
+     static bool logMemory; //!< Activate memory monitoring for all XIOS process (generate CSV file for https://forge.ipsl.jussieu.fr/ioserver/chrome/site/XIOS_TOOLS/xios_memory.html)
+     static bool reportMemory; //!< Activate memory reporting for all XIOS process (report in log files)
+
      static const string defaultPoolId ;
      static const string defaultServerId ;

XIOS3/trunk/src/io/nc4_data_output.cpp

@@ -865 +865 @@
          StdString dimXid = cellName+appendDomid;
          StdString dimVertId;
-         if (domain->nvertex_name.isEmpty()) dimVertId = "nvertex";
+         if (domain->nvertex_name.isEmpty()) dimVertId = "nvertex"+appendDomid; 
          else dimVertId = domain->nvertex_name;
 

XIOS3/trunk/src/mem_checker.cpp

@@ -44 +44 @@
   {
     std::vector<double> memories(0);
+    if ( !CXios::reportMemory ) return memories ;
     memories.clear();
     

XIOS3/trunk/src/server.cpp

@@ -548 +548 @@
       report(0)<<"Performance report : Ratio : "<<CTimer::get("Process events").getCumulatedTime()/CTimer::get("XIOS server").getCumulatedTime()*100.<<"%"<<endl  ;
       report(100)<<CTimer::getAllCumulatedTime()<<endl ;
-      report(100)<<CMemChecker::getAllCumulatedMem()<<endl ;
+      if (CXios::reportMemory)
+      {
+        report(100)<<CMemChecker::getAllCumulatedMem()<<endl ;
+      }
       
       CWorkflowGraph::drawWorkFlowGraph_server();