Changeset 2337

Timestamp:

06/23/22 11:54:18 (2 years ago)

Author:

jderouillat

Message:

Set enabled to false for fields contained in disabled files. solveRefInheritance is operated after to propagate this attribure and so to deactivate, in the workflow, read_access field which could require data included in disabled file.

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp (modified) (4 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

@@ -894 +894 @@
     solveDescInheritance(true);
  
-    // Solve inheritance for field to know if enabled or not.
-    for (auto field : CField::getAll()) field->solveRefInheritance();
-
     // Check if some axis, domains or grids are eligible to for compressed indexed output.
     // Warning: This must be done after solving the inheritance and before the rest of post-processing
@@ -909 +906 @@
     //Initialisation du vecteur 'enabledFiles' contenant la liste des fichiers à sortir.
     findEnabledFiles();
+
+    // Solve inheritance for field to know if enabled or not.
+    for (auto field : CField::getAll()) field->solveRefInheritance();
+
     findEnabledWriteModeFiles();
     findEnabledReadModeFiles();
@@ -923 +924 @@
     vector<CField*>& fieldWithReadAccess = fieldsWithReadAccess_ ;
     vector<CField*> fieldModelIn ; // fields potentially from model
-     
+
     // define if files are on clientSied or serverSide 
     if (serviceType_==CServicesManager::CLIENT)
@@ -1341 +1342 @@
                enabledFiles.push_back(allFiles[i]);
             }
+            else // Si l'attribut 'enabled' est fixé à faux.
+            {
+              // disabled all fields contained in file (used in findFieldsWithReadAccess through field_ref dependencies)
+              const vector<CField*>&& fieldList=allFiles[i]->getEnabledFields() ;
+              for(auto field : fieldList) field->enabled.setValue(false);
+            }
          }
          else