Skip to content

Commit

Permalink
Okay most tests fail
Browse files Browse the repository at this point in the history
  • Loading branch information
reverendbedford committed Jan 10, 2024
1 parent afd2af7 commit 5f35da5
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 26 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ build
*.csv
*.previous_test_results.json
*~
*.yaml
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ALL_MODULES := no
CHEMICAL_REACTIONS := no
CONTACT := yes
FLUID_PROPERTIES := no
HEAT_CONDUCTION := yes
HEAT_TRANSFER := yes
MISC := no
NAVIER_STOKES := no
PHASE_FIELD := no
Expand Down
2 changes: 1 addition & 1 deletion include/postprocessors/CZMAreaRatioPostprocessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ class CZMAreaRatioPostprocessor : public CZMAreaPostprocessor
CZMAreaRatioPostprocessor(const InputParameters & parameters);

protected:
virtual Real getValue() override;
virtual Real getValue();
};
5 changes: 3 additions & 2 deletions include/postprocessors/ElementExtremeVectorMaterialProperty.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ class ElementExtremeVectorMaterialProperty : public ElementPostprocessor

virtual void initialize() override;
virtual void execute() override;
virtual Real getValue() override;
virtual PostprocessorValue getValue() const;
virtual void threadJoin(const UserObject & y) override;
virtual void finalize() override;

protected:
virtual void computeQpValue();
Expand All @@ -27,6 +28,6 @@ class ElementExtremeVectorMaterialProperty : public ElementPostprocessor
unsigned int _index;

ExtremeType _type;
Real _value;
PostprocessorValue _value;
unsigned int _qp;
};
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class MaterialTensorIntegralInterfaceScaledTempl : public InterfaceIntegralPostp
static InputParameters validParams();

MaterialTensorIntegralInterfaceScaledTempl(const InputParameters & parameters);
virtual Real getValue() override;
virtual Real getValue();

protected:
virtual Real computeQpIntegral();
Expand Down
2 changes: 1 addition & 1 deletion include/postprocessors/MaterialTensorIntegralScaled.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class MaterialTensorIntegralScaledTempl : public MaterialTensorIntegralTempl<is_
static InputParameters validParams();

MaterialTensorIntegralScaledTempl(const InputParameters & parameters);
virtual Real getValue() override;
virtual PostprocessorValue getValue();

protected:
const PostprocessorValue & _scaling_factor_PP;
Expand Down
2 changes: 1 addition & 1 deletion include/postprocessors/MultiplyPostprocessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class MultiplyPostprocessor : public GeneralPostprocessor

virtual void initialize() override;
virtual void execute() override;
virtual PostprocessorValue getValue() override;
virtual PostprocessorValue getValue() const;

protected:
const PostprocessorValue & _value1;
Expand Down
4 changes: 2 additions & 2 deletions include/postprocessors/RankTwoTensorInvariantPostprocessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class RankTwoTensorInvariantPostprocessor : public GeneralPostprocessor
/// we don't need to override finalize because we are working with
/// postprocessors values. Therefore the values this PP will get, have already
/// be summed/averaged among processes/threads.
virtual Real getValue() override;
virtual PostprocessorValue getValue() const;

protected:
const PostprocessorName _rank_two_tensor_base_name;
Expand All @@ -44,7 +44,7 @@ class RankTwoTensorInvariantPostprocessor : public GeneralPostprocessor
std::vector<std::vector<const PostprocessorValue *>> _pps_values;

/// the calculated invariant value to be returned
Real _invariant;
PostprocessorValue _invariant;

/// the map between postprocessor names and tensorial components
const std::map<std::pair<int, int>, std::string> tensor_map = {{std::make_pair(0, 0), "xx"},
Expand Down
5 changes: 3 additions & 2 deletions include/postprocessors/SideExtremePostprocessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ class SideExtremePostprocessor : public SidePostprocessor

virtual void initialize() override;
virtual void execute() override;
virtual Real getValue() override;
virtual PostprocessorValue getValue() const;
virtual void threadJoin(const UserObject & y) override;
virtual void finalize() override;

protected:
unsigned int _qp;
Real _curr_value;
PostprocessorValue _curr_value;
const VariableValue & _u;
const ExtremeType _type;
};
4 changes: 2 additions & 2 deletions include/postprocessors/TimeDerivativePostprocessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ class TimeDerivativePostprocessor : public GeneralPostprocessor

virtual void initialize() override;
virtual void execute() override;
virtual Real getValue() override;
virtual PostprocessorValue getValue() const;

protected:
/// cumulative sum of the post-processor value
Real _rate;
PostprocessorValue _rate;

/// current post-processor value
const PostprocessorValue & _pps_value;
Expand Down
12 changes: 8 additions & 4 deletions src/postprocessors/ElementExtremeVectorMaterialProperty.C
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,14 @@ ElementExtremeVectorMaterialProperty::computeQpValue()
}
}

Real
ElementExtremeVectorMaterialProperty::getValue()
PostprocessorValue
ElementExtremeVectorMaterialProperty::getValue() const
{
return _value;
}

void
ElementExtremeVectorMaterialProperty::finalize()
{
switch (_type)
{
Expand All @@ -78,8 +84,6 @@ ElementExtremeVectorMaterialProperty::getValue()
gatherMin(_value);
break;
}

return _value;
}

void
Expand Down
2 changes: 1 addition & 1 deletion src/postprocessors/MaterialTensorIntegralScaled.C
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MaterialTensorIntegralScaledTempl<is_ad>::MaterialTensorIntegralScaledTempl(
}

template <bool is_ad>
Real
PostprocessorValue
MaterialTensorIntegralScaledTempl<is_ad>::getValue()
{
this->_integral_value = MaterialTensorIntegralTempl<is_ad>::getValue();
Expand Down
2 changes: 1 addition & 1 deletion src/postprocessors/MultiplyPostprocessor.C
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ MultiplyPostprocessor::execute()
}

PostprocessorValue
MultiplyPostprocessor::getValue()
MultiplyPostprocessor::getValue() const
{
return _value1 * _value2;
}
4 changes: 2 additions & 2 deletions src/postprocessors/RankTwoTensorInvariantPostprocessor.C
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ RankTwoTensorInvariantPostprocessor::execute()
}
}

Real
RankTwoTensorInvariantPostprocessor::getValue()
PostprocessorValue
RankTwoTensorInvariantPostprocessor::getValue() const
{
return _invariant;
}
11 changes: 8 additions & 3 deletions src/postprocessors/SideExtremePostprocessor.C
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,14 @@ SideExtremePostprocessor::execute()
}
}

Real
SideExtremePostprocessor::getValue()
PostprocessorValue
SideExtremePostprocessor::getValue() const
{
return _curr_value;
}

void
SideExtremePostprocessor::finalize()
{
switch (_type)
{
Expand All @@ -72,7 +78,6 @@ SideExtremePostprocessor::getValue()
gatherMin(_curr_value);
break;
}
return _curr_value;
}

void
Expand Down
4 changes: 2 additions & 2 deletions src/postprocessors/TimeDerivativePostprocessor.C
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ TimeDerivativePostprocessor::execute()
_rate = (_pps_value - _pps_value_old) / _dt;
}

Real
TimeDerivativePostprocessor::getValue()
PostprocessorValue
TimeDerivativePostprocessor::getValue() const
{
return _rate;
}

0 comments on commit 5f35da5

Please sign in to comment.