Skip to content

Commit

Permalink
Merge pull request #29640 from dschwen/solution_uo_29639
Browse files Browse the repository at this point in the history
Add time transformation
  • Loading branch information
dschwen authored Jan 10, 2025
2 parents e562d1f + 4f4d28a commit a4140e9
Show file tree
Hide file tree
Showing 24 changed files with 1,868 additions and 1,744 deletions.
4 changes: 2 additions & 2 deletions framework/include/auxkernels/SolutionAux.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "AuxKernel.h"

class SolutionUserObject;
class SolutionUserObjectBase;

/**
* AuxKernel for reading a solution from file.
Expand Down Expand Up @@ -41,7 +41,7 @@ class SolutionAux : public AuxKernel
virtual Real computeValue() override;

/// Reference to the SolutionUserObject storing the solution
const SolutionUserObject & _solution_object;
const SolutionUserObjectBase & _solution_object;

/// The variable name of interest
std::string _var_name;
Expand Down
4 changes: 2 additions & 2 deletions framework/include/auxkernels/SolutionScalarAux.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "AuxScalarKernel.h"

class SolutionUserObject;
class SolutionUserObjectBase;

/**
* AuxScalarKernel for reading a solution from file.
Expand All @@ -32,7 +32,7 @@ class SolutionScalarAux : public AuxScalarKernel
virtual Real computeValue() override;

/// Reference to the SolutionUserObject storing the solution
const SolutionUserObject & _solution_object;
const SolutionUserObjectBase & _solution_object;

/// The variable name of interest
std::string _var_name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "Function.h"

class SolutionUserObject;
class SolutionUserObjectBase;

/**
* Function for reading a 2D axisymmetric solution from file and mapping it to a
Expand Down Expand Up @@ -44,7 +44,7 @@ class Axisymmetric2D3DSolutionFunction : public Function

protected:
/// Pointer to SolutionUserObject containing the solution of interest
const SolutionUserObject * _solution_object_ptr;
const SolutionUserObjectBase * _solution_object_ptr;

/// Factor to scale the solution by (default = 1)
const Real _scale_factor;
Expand Down
4 changes: 2 additions & 2 deletions framework/include/functions/SolutionFunction.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "Function.h"

class SolutionUserObject;
class SolutionUserObjectBase;

/** Function for reading a solution from file
* Creates a function that extracts values from a solution read from a file,
Expand Down Expand Up @@ -55,7 +55,7 @@ class SolutionFunction : public Function

protected:
/// Pointer to SolutionUserObject containing the solution of interest
const SolutionUserObject * _solution_object_ptr;
const SolutionUserObjectBase * _solution_object_ptr;

/// The local SolutionUserObject index for the variable extracted from the file
unsigned int _solution_object_var_index;
Expand Down
4 changes: 2 additions & 2 deletions framework/include/ics/ScalarSolutionIC.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "ScalarInitialCondition.h"

class SolutionUserObject;
class SolutionUserObjectBase;

/**
* Class for reading an initial condition from a solution user object
Expand All @@ -25,7 +25,7 @@ class ScalarSolutionIC : public ScalarInitialCondition

protected:
/// SolutionUserObject containing the solution of interest
const SolutionUserObject & _solution_object;
const SolutionUserObjectBase & _solution_object;

/// The variable name extracted from the SolutionUserObject
const VariableName & _solution_object_var_name;
Expand Down
4 changes: 2 additions & 2 deletions framework/include/ics/SolutionIC.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "InitialCondition.h"

class SolutionUserObject;
class SolutionUserObjectBase;

/**
* Class for reading an initial condition from a solution user object
Expand All @@ -27,7 +27,7 @@ class SolutionIC : public InitialCondition

protected:
/// SolutionUserObject containing the solution of interest
const SolutionUserObject & _solution_object;
const SolutionUserObjectBase & _solution_object;

/// The variable name extracted from the SolutionUserObject
const VariableName & _solution_object_var_name;
Expand Down
Loading

0 comments on commit a4140e9

Please sign in to comment.