not allow copies of all input parameters in the warehouse idaholab#22068

YaqiWang · Sep 13, 2022 · 8af9ff7 · 8af9ff7
1 parent 898132d
commit 8af9ff7
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 8 deletions.
diff --git a/framework/include/outputs/formatters/ExodusFormatter.h b/framework/include/outputs/formatters/ExodusFormatter.h
@@ -11,6 +11,12 @@
 
 #include "InputFileFormatter.h"
 
+#include <sstream>
+#include <string>
+#include <vector>
+
+class ActionWarehouse;
+
 /*
  * Dumps the input file in the Exodus output
  */

diff --git a/framework/include/outputs/formatters/SyntaxFormatterInterface.h b/framework/include/outputs/formatters/SyntaxFormatterInterface.h
@@ -12,9 +12,7 @@
 #include <string>
 #include <ostream>
 
-#include "InputParameters.h"
-#include "ActionWarehouse.h"
-#include "MooseSyntax.h"
+class InputParameters;
 
 /**
  * This interface is for classes that want to be called to format InputParameters.  When the

diff --git a/framework/include/outputs/formatters/YAMLFormatter.h b/framework/include/outputs/formatters/YAMLFormatter.h
@@ -10,6 +10,8 @@
 #pragma once
 
 #include "SyntaxTree.h"
+#include "InputParameters.h"
+
 #include <sstream>
 #include <iterator>
 

diff --git a/framework/include/utils/InputParameters.h b/framework/include/utils/InputParameters.h
@@ -1015,6 +1015,7 @@ class InputParameters : public Parameters
   friend InputParameters emptyInputParameters();
   friend class InputParameterWarehouse;
   friend class Parser;
+  friend class ActionWarehouse;
 
   // For setting _from_legacy_construction (remove with #19440)
   template <typename T>

diff --git a/framework/include/utils/SyntaxTree.h b/framework/include/utils/SyntaxTree.h
@@ -13,6 +13,7 @@
 
 #include <string>
 #include <map>
+#include <set>
 
 // Forward declarations
 class InputParameters;

diff --git a/framework/src/actions/ActionWarehouse.C b/framework/src/actions/ActionWarehouse.C
@@ -20,6 +20,7 @@
 #include "InfixIterator.h"
 #include "FEProblem.h"
 #include "MemoryUtils.h"
+#include "InputParameterWarehouse.h"
 
 #include "libmesh/simple_range.h"
 
@@ -411,10 +412,15 @@ ActionWarehouse::printInputFile(std::ostream & out)
     bool is_parent;
     if (_syntax.isAssociated(name, &is_parent) != "")
     {
-      InputParameters params = act->parameters();
+      const auto & all_params = _app.getInputParameterWarehouse().getInputParameters();
+      InputParameters & params = *(all_params.find(act->uniqueActionName())->second.get());
+
+      // temporarily allow input parameter copies required by the input file formatter
+      params.allowCopy(true);
 
       // TODO: Do we need to insert more nodes for each task?
       tree.insertNode(name, *tasks.begin(), true, &params);
+      params.allowCopy(false);
 
       MooseObjectAction * moose_object_action = dynamic_cast<MooseObjectAction *>(act);
       if (moose_object_action)

diff --git a/framework/src/outputs/formatters/ExodusFormatter.C b/framework/src/outputs/formatters/ExodusFormatter.C
@@ -13,6 +13,7 @@
 #include "MooseApp.h"
 #include "SystemInfo.h"
 #include "CommandLine.h"
+#include "ActionWarehouse.h"
 
 #include "libmesh/exodusII.h"
 

diff --git a/framework/src/outputs/formatters/InputFileFormatter.C b/framework/src/outputs/formatters/InputFileFormatter.C
@@ -9,6 +9,7 @@
 
 #include "InputFileFormatter.h"
 #include "MooseUtils.h"
+#include "InputParameters.h"
 
 #include <sstream>
 #include <vector>

diff --git a/framework/src/utils/InputParameterWarehouse.C b/framework/src/utils/InputParameterWarehouse.C
@@ -98,10 +98,7 @@ InputParameterWarehouse::addInputParameters(const std::string & name,
   ptr->addPrivateParam<THREAD_ID>("_tid", tid);
 
   // no more copies allowed
-  // Note: we have to skip action parameters for now due to parameter copy operations in
-  //       the input parameter printing capability in ActionWarehouse::printInputFile.
-  if (base != "Action")
-    ptr->allowCopy(false);
+  ptr->allowCopy(false);
 
   // Return a reference to the InputParameters object
   return *ptr;