Commit b8abc047 authored by Antoine Jacquey's avatar Antoine Jacquey

Merge devel into master

parents fa03811b 5c1100b6
...@@ -63,7 +63,9 @@ ...@@ -63,7 +63,9 @@
"LynxHoldStressAction.C": "cpp", "LynxHoldStressAction.C": "cpp",
"LynxPressureAction.C": "cpp", "LynxPressureAction.C": "cpp",
"LynxTestApp.C": "cpp", "LynxTestApp.C": "cpp",
"bcs_Unity.C": "cpp" "bcs_Unity.C": "cpp",
"LynxHydroBase.C": "cpp"
}, },
"C_Cpp.errorSquiggles": "Disabled" "C_Cpp.errorSquiggles": "Disabled",
"python.pythonPath": "/opt/moose/miniconda/bin/python"
} }
\ No newline at end of file
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXADVECTIONACTION_H #pragma once
#define LYNXADVECTIONACTION_H
#include "Action.h" #include "Action.h"
...@@ -72,6 +64,4 @@ protected: ...@@ -72,6 +64,4 @@ protected:
std::vector<std::string> _max_entropy_pp; std::vector<std::string> _max_entropy_pp;
std::vector<std::string> _min_entropy_pp; std::vector<std::string> _min_entropy_pp;
std::vector<std::string> _avg_entropy_pp; std::vector<std::string> _avg_entropy_pp;
}; };
\ No newline at end of file
#endif // LYNXADVECTIONACTION_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXHOLDSTRESSACTION_H #pragma once
#define LYNXHOLDSTRESSACTION_H
#include "Action.h" #include "Action.h"
...@@ -38,6 +30,4 @@ public: ...@@ -38,6 +30,4 @@ public:
protected: protected:
std::vector<std::vector<AuxVariableName>> _save_in_vars; std::vector<std::vector<AuxVariableName>> _save_in_vars;
std::vector<bool> _has_save_in_vars; std::vector<bool> _has_save_in_vars;
}; };
\ No newline at end of file
#endif // LYNXHOLDSTRESSACTION_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXPRESSUREACTION_H #pragma once
#define LYNXPRESSUREACTION_H
#include "Action.h" #include "Action.h"
...@@ -38,6 +30,4 @@ public: ...@@ -38,6 +30,4 @@ public:
protected: protected:
std::vector<std::vector<AuxVariableName>> _save_in_vars; std::vector<std::vector<AuxVariableName>> _save_in_vars;
std::vector<bool> _has_save_in_vars; std::vector<bool> _has_save_in_vars;
}; };
\ No newline at end of file
#endif // LYNXPRESSUREACTION_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXCOMBOPHASESAUX_H #pragma once
#define LYNXCOMBOPHASESAUX_H
#include "AuxKernel.h" #include "AuxKernel.h"
...@@ -39,5 +31,3 @@ protected: ...@@ -39,5 +31,3 @@ protected:
unsigned _n_composition; unsigned _n_composition;
std::vector<const VariableValue *> _compositional_phases; std::vector<const VariableValue *> _compositional_phases;
}; };
#endif // LYNXCOMBOPHASESAUX_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXEFFECTIVEPRESSUREAUX_H #pragma once
#define LYNXEFFECTIVEPRESSUREAUX_H
#include "LynxStressAuxBase.h" #include "LynxStressAuxBase.h"
...@@ -35,6 +27,4 @@ public: ...@@ -35,6 +27,4 @@ public:
protected: protected:
virtual Real computeValue() override; virtual Real computeValue() override;
}; };
\ No newline at end of file
#endif // LYNXEFFECTIVEPRESSUREAUX_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXELASTICEQVSTRAINAUX_H #pragma once
#define LYNXELASTICEQVSTRAINAUX_H
#include "LynxElasticStrainAuxBase.h" #include "LynxElasticStrainAuxBase.h"
...@@ -35,6 +27,4 @@ public: ...@@ -35,6 +27,4 @@ public:
protected: protected:
virtual Real computeValue(); virtual Real computeValue();
}; };
\ No newline at end of file
#endif // LYNXELASTICEQVSTRAINAUX_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXELASTICSTRAINAUXBASE_H #pragma once
#define LYNXELASTICSTRAINAUXBASE_H
#include "AuxKernel.h" #include "AuxKernel.h"
#include "RankTwoTensor.h" #include "RankTwoTensor.h"
...@@ -36,6 +28,4 @@ public: ...@@ -36,6 +28,4 @@ public:
LynxElasticStrainAuxBase(const InputParameters & parameters); LynxElasticStrainAuxBase(const InputParameters & parameters);
const MaterialProperty<RankTwoTensor> & _elastic_strain; const MaterialProperty<RankTwoTensor> & _elastic_strain;
}; };
\ No newline at end of file
#endif // LYNXELASTICSTRAINAUXBASE_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXELASTICVOLSTRAINAUX_H #pragma once
#define LYNXELASTICVOLSTRAINAUX_H
#include "LynxElasticStrainAuxBase.h" #include "LynxElasticStrainAuxBase.h"
...@@ -35,6 +27,4 @@ public: ...@@ -35,6 +27,4 @@ public:
protected: protected:
virtual Real computeValue(); virtual Real computeValue();
}; };
\ No newline at end of file
#endif // LYNXELASTICVOLSTRAINAUX_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXENTROPYAUX_H
#define LYNXENTROPYAUX_H #pragma once
#include "AuxKernel.h" #include "AuxKernel.h"
#include "DerivativeMaterialInterface.h" #include "DerivativeMaterialInterface.h"
...@@ -40,6 +33,4 @@ protected: ...@@ -40,6 +33,4 @@ protected:
const PostprocessorValue & _pp_max_var; const PostprocessorValue & _pp_max_var;
const PostprocessorValue & _pp_min_var; const PostprocessorValue & _pp_min_var;
}; };
\ No newline at end of file
#endif // LYNXENTROPY_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXEQVSTRAINAUX_H #pragma once
#define LYNXEQVSTRAINAUX_H
#include "LynxStrainAuxBase.h" #include "LynxStrainAuxBase.h"
...@@ -35,6 +27,4 @@ public: ...@@ -35,6 +27,4 @@ public:
protected: protected:
virtual Real computeValue() override; virtual Real computeValue() override;
}; };
\ No newline at end of file
#endif // LYNXEQVSTRAINAUX_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXEQVSTRAINRATEAUX_H #pragma once
#define LYNXEQVSTRAINRATEAUX_H
#include "LynxStrainAuxBase.h" #include "LynxStrainAuxBase.h"
...@@ -35,6 +27,4 @@ public: ...@@ -35,6 +27,4 @@ public:
protected: protected:
virtual Real computeValue() override; virtual Real computeValue() override;
}; };
\ No newline at end of file
#endif // LYNXEQVSTRAINRATEAUX_H
/******************************************************************************/ /******************************************************************************/
/* This file is part of */
/* LYNX, a MOOSE-based application */ /* LYNX, a MOOSE-based application */
/* Lithosphere dYnamic Numerical toolboX */
/* */ /* */
/* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */ /* Copyright (C) 2017 by Antoine B. Jacquey and Mauro Cacace */
/* GFZ Potsdam, German Research Centre for Geosciences */ /* GFZ Potsdam, German Research Centre for Geosciences */
/* */ /* */
/* This program is free software: you can redistribute it and/or modify */ /* Licensed under GNU General Public License 3, */
/* it under the terms of the GNU General Public License as published by */ /* please see LICENSE for details */
/* the Free Software Foundation, either version 3 of the License, or */ /* or http://www.gnu.org/licenses/gpl.html */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/> */
/******************************************************************************/ /******************************************************************************/
#ifndef LYNXHEATFLUXAUX_H #pragma once
#define LYNXHEATFLUXAUX_H
#include "AuxKernel.h"