Skip to content
GitLab
Commit d5079bde authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1022 Rebranding of blocks: as it is the former second column and row blocks... 

#1022 Rebranding of blocks: as it is the former second column and row blocks that were removed, rebrand the '3' '2'.
parent f9c92b04
Hide whitespace changes
Inline Side-by-side
HappyHeart.xcodeproj/project.pbxproj
View file @ d5079bde
......@@ -495,6 +495,14 @@
BE1D9E261DD086A900C1D355 /* UpdatePressureAtQuadPt.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE1D9E241DD086A900C1D355 /* UpdatePressureAtQuadPt.hxx */; };
BE1D9E291DD086B900C1D355 /* UpdatePressureAtQuadPt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE1D9E271DD086B900C1D355 /* UpdatePressureAtQuadPt.hpp */; };
BE1D9E2A1DD086B900C1D355 /* UpdatePressureAtQuadPt.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE1D9E281DD086B900C1D355 /* UpdatePressureAtQuadPt.hxx */; };
BE1D9E491DD0D9F200C1D355 /* T22.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE1D9E461DD0D9F200C1D355 /* T22.cpp */; };
BE1D9E4A1DD0D9F200C1D355 /* T22.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE1D9E461DD0D9F200C1D355 /* T22.cpp */; };
BE1D9E4B1DD0D9F200C1D355 /* T22.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE1D9E471DD0D9F200C1D355 /* T22.hpp */; };
BE1D9E4C1DD0D9F200C1D355 /* T22.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE1D9E481DD0D9F200C1D355 /* T22.hxx */; };
BE1D9E501DD0D9FD00C1D355 /* T22.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE1D9E4D1DD0D9FD00C1D355 /* T22.cpp */; };
BE1D9E511DD0D9FD00C1D355 /* T22.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE1D9E4D1DD0D9FD00C1D355 /* T22.cpp */; };
BE1D9E521DD0D9FD00C1D355 /* T22.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE1D9E4E1DD0D9FD00C1D355 /* T22.hpp */; };
BE1D9E531DD0D9FD00C1D355 /* T22.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE1D9E4F1DD0D9FD00C1D355 /* T22.hxx */; };
BE1E873D1B8DBF460002EE64 /* Definitions.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE1E873C1B8DBF460002EE64 /* Definitions.hpp */; };
BE1E87401B8DBF670002EE64 /* Definitions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE1E873E1B8DBF670002EE64 /* Definitions.cpp */; };
BE1E87471B8DC7CE0002EE64 /* VolumicMass.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE1E87441B8DC7CE0002EE64 /* VolumicMass.hpp */; };
......@@ -1242,18 +1250,10 @@
BE71B9251DB75AE5005DCB59 /* HybridVector.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8E81DB75AE5005DCB59 /* HybridVector.hxx */; };
BE71B9281DB75AE5005DCB59 /* T21.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8EB1DB75AE5005DCB59 /* T21.hpp */; };
BE71B9291DB75AE5005DCB59 /* T21.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8EC1DB75AE5005DCB59 /* T21.hxx */; };
BE71B92A1DB75AE5005DCB59 /* T33.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE71B8ED1DB75AE5005DCB59 /* T33.cpp */; };
BE71B92B1DB75AE5005DCB59 /* T33.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE71B8ED1DB75AE5005DCB59 /* T33.cpp */; };
BE71B92C1DB75AE5005DCB59 /* T33.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8EE1DB75AE5005DCB59 /* T33.hpp */; };
BE71B92D1DB75AE5005DCB59 /* T33.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8EF1DB75AE5005DCB59 /* T33.hxx */; };
BE71B9301DB75AE5005DCB59 /* HybridVector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8F21DB75AE5005DCB59 /* HybridVector.hpp */; };
BE71B9311DB75AE5005DCB59 /* HybridVector.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8F31DB75AE5005DCB59 /* HybridVector.hxx */; };
BE71B9341DB75AE5005DCB59 /* T21.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8F61DB75AE5005DCB59 /* T21.hpp */; };
BE71B9351DB75AE5005DCB59 /* T21.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8F71DB75AE5005DCB59 /* T21.hxx */; };
BE71B9361DB75AE5005DCB59 /* T33.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE71B8F81DB75AE5005DCB59 /* T33.cpp */; };
BE71B9371DB75AE5005DCB59 /* T33.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE71B8F81DB75AE5005DCB59 /* T33.cpp */; };
BE71B9381DB75AE5005DCB59 /* T33.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8F91DB75AE5005DCB59 /* T33.hpp */; };
BE71B9391DB75AE5005DCB59 /* T33.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8FA1DB75AE5005DCB59 /* T33.hxx */; };
BE71B93A1DB75AE5005DCB59 /* VariationalFormulation.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8FB1DB75AE5005DCB59 /* VariationalFormulation.hpp */; };
BE71B93B1DB75AE5005DCB59 /* VariationalFormulation.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8FC1DB75AE5005DCB59 /* VariationalFormulation.hxx */; };
BE71B93C1DB75AE5005DCB59 /* VariationalFormulationAccessors.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE71B8FD1DB75AE5005DCB59 /* VariationalFormulationAccessors.hxx */; };
......@@ -5211,6 +5211,12 @@
BE1D9E241DD086A900C1D355 /* UpdatePressureAtQuadPt.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = UpdatePressureAtQuadPt.hxx; sourceTree = "<group>"; };
BE1D9E271DD086B900C1D355 /* UpdatePressureAtQuadPt.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = UpdatePressureAtQuadPt.hpp; sourceTree = "<group>"; };
BE1D9E281DD086B900C1D355 /* UpdatePressureAtQuadPt.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = UpdatePressureAtQuadPt.hxx; sourceTree = "<group>"; };
BE1D9E461DD0D9F200C1D355 /* T22.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = T22.cpp; sourceTree = "<group>"; };
BE1D9E471DD0D9F200C1D355 /* T22.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T22.hpp; sourceTree = "<group>"; };
BE1D9E481DD0D9F200C1D355 /* T22.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T22.hxx; sourceTree = "<group>"; };
BE1D9E4D1DD0D9FD00C1D355 /* T22.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = T22.cpp; sourceTree = "<group>"; };
BE1D9E4E1DD0D9FD00C1D355 /* T22.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T22.hpp; sourceTree = "<group>"; };
BE1D9E4F1DD0D9FD00C1D355 /* T22.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T22.hxx; sourceTree = "<group>"; };
BE1E873C1B8DBF460002EE64 /* Definitions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Definitions.hpp; sourceTree = "<group>"; };
BE1E873E1B8DBF670002EE64 /* Definitions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Definitions.cpp; sourceTree = "<group>"; };
BE1E87441B8DC7CE0002EE64 /* VolumicMass.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = VolumicMass.hpp; path = Parameter/MaterialProperty/VolumicMass.hpp; sourceTree = "<group>"; };
......@@ -5866,16 +5872,10 @@
BE71B8E81DB75AE5005DCB59 /* HybridVector.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = HybridVector.hxx; sourceTree = "<group>"; };
BE71B8EB1DB75AE5005DCB59 /* T21.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T21.hpp; sourceTree = "<group>"; };
BE71B8EC1DB75AE5005DCB59 /* T21.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T21.hxx; sourceTree = "<group>"; };
BE71B8ED1DB75AE5005DCB59 /* T33.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = T33.cpp; sourceTree = "<group>"; };
BE71B8EE1DB75AE5005DCB59 /* T33.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T33.hpp; sourceTree = "<group>"; };
BE71B8EF1DB75AE5005DCB59 /* T33.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T33.hxx; sourceTree = "<group>"; };
BE71B8F21DB75AE5005DCB59 /* HybridVector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = HybridVector.hpp; sourceTree = "<group>"; };
BE71B8F31DB75AE5005DCB59 /* HybridVector.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = HybridVector.hxx; sourceTree = "<group>"; };
BE71B8F61DB75AE5005DCB59 /* T21.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T21.hpp; sourceTree = "<group>"; };
BE71B8F71DB75AE5005DCB59 /* T21.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T21.hxx; sourceTree = "<group>"; };
BE71B8F81DB75AE5005DCB59 /* T33.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = T33.cpp; sourceTree = "<group>"; };
BE71B8F91DB75AE5005DCB59 /* T33.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T33.hpp; sourceTree = "<group>"; };
BE71B8FA1DB75AE5005DCB59 /* T33.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = T33.hxx; sourceTree = "<group>"; };
BE71B8FB1DB75AE5005DCB59 /* VariationalFormulation.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = VariationalFormulation.hpp; sourceTree = "<group>"; };
BE71B8FC1DB75AE5005DCB59 /* VariationalFormulation.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = VariationalFormulation.hxx; sourceTree = "<group>"; };
BE71B8FD1DB75AE5005DCB59 /* VariationalFormulationAccessors.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = VariationalFormulationAccessors.hxx; sourceTree = "<group>"; };
......@@ -10254,9 +10254,9 @@
BE71B8E81DB75AE5005DCB59 /* HybridVector.hxx */,
BE71B8EB1DB75AE5005DCB59 /* T21.hpp */,
BE71B8EC1DB75AE5005DCB59 /* T21.hxx */,
BE71B8ED1DB75AE5005DCB59 /* T33.cpp */,
BE71B8EE1DB75AE5005DCB59 /* T33.hpp */,
BE71B8EF1DB75AE5005DCB59 /* T33.hxx */,
BE1D9E461DD0D9F200C1D355 /* T22.cpp */,
BE1D9E471DD0D9F200C1D355 /* T22.hpp */,
BE1D9E481DD0D9F200C1D355 /* T22.hxx */,
);
path = GlobalVariationalOperatorInstances;
sourceTree = "<group>";
......@@ -10268,9 +10268,9 @@
BE71B8F31DB75AE5005DCB59 /* HybridVector.hxx */,
BE71B8F61DB75AE5005DCB59 /* T21.hpp */,
BE71B8F71DB75AE5005DCB59 /* T21.hxx */,
BE71B8F81DB75AE5005DCB59 /* T33.cpp */,
BE71B8F91DB75AE5005DCB59 /* T33.hpp */,
BE71B8FA1DB75AE5005DCB59 /* T33.hxx */,
BE1D9E4D1DD0D9FD00C1D355 /* T22.cpp */,
BE1D9E4E1DD0D9FD00C1D355 /* T22.hpp */,
BE1D9E4F1DD0D9FD00C1D355 /* T22.hxx */,
);
path = LocalVariationalOperatorInstances;
sourceTree = "<group>";
......@@ -13106,13 +13106,14 @@
BE71B9351DB75AE5005DCB59 /* T21.hxx in Headers */,
BE99AAD21DBF87AF00ADBB1A /* NewFluidPressureData.hxx in Headers */,
BE71B93C1DB75AE5005DCB59 /* VariationalFormulationAccessors.hxx in Headers */,
BE71B9391DB75AE5005DCB59 /* T33.hxx in Headers */,
BE71B9411DB75AE5005DCB59 /* VariationalFormulation.hpp in Headers */,
BE71B9211DB75AE5005DCB59 /* Darcy.hxx in Headers */,
BEE7E2EA1DB76BE20018E962 /* VariationalFormulationAccessors.hxx in Headers */,
BE1D9E4C1DD0D9F200C1D355 /* T22.hxx in Headers */,
BE71B9191DB75AE5005DCB59 /* VariationalFormulationInit.hxx in Headers */,
BE1D9E291DD086B900C1D355 /* UpdatePressureAtQuadPt.hpp in Headers */,
BEEE97991DCB279B0061727F /* SolidDeltaResidual.hxx in Headers */,
BE1D9E521DD0D9FD00C1D355 /* T22.hpp in Headers */,
BEEE979D1DCB27A40061727F /* SolidDeltaResidual.hxx in Headers */,
BE71B9181DB75AE5005DCB59 /* VariationalFormulationAccessors.hxx in Headers */,
BE71B9401DB75AE5005DCB59 /* Policy.hxx in Headers */,
......@@ -13127,16 +13128,15 @@
BE71B91D1DB75AE5005DCB59 /* Darcy.hxx in Headers */,
BE71B9201DB75AE5005DCB59 /* Darcy.hpp in Headers */,
BEEE979C1DCB27A40061727F /* SolidDeltaResidual.hpp in Headers */,
BE71B92C1DB75AE5005DCB59 /* T33.hpp in Headers */,
BE71B9301DB75AE5005DCB59 /* HybridVector.hpp in Headers */,
BE71B90C1DB75AE5005DCB59 /* HybridVector.hpp in Headers */,
BE71B91C1DB75AE5005DCB59 /* Darcy.hpp in Headers */,
BE71B9141DB75AE5005DCB59 /* HybridVector.hpp in Headers */,
BE71B9381DB75AE5005DCB59 /* T33.hpp in Headers */,
BE1D9E531DD0D9FD00C1D355 /* T22.hxx in Headers */,
BE71B93E1DB75AE5005DCB59 /* VariationalFormulationInit.hxx in Headers */,
BE71B9161DB75AE5005DCB59 /* VariationalFormulation.hpp in Headers */,
BE71B92D1DB75AE5005DCB59 /* T33.hxx in Headers */,
BE71B9421DB75AE5005DCB59 /* VariationalFormulation.hxx in Headers */,
BE1D9E4B1DD0D9F200C1D355 /* T22.hpp in Headers */,
BE71B9151DB75AE5005DCB59 /* HybridVector.hxx in Headers */,
BE71B9081DB75AE5005DCB59 /* DifferentialDarcy.hpp in Headers */,
BE71B93D1DB75AE5005DCB59 /* VariationalFormulationComputeMatrixBlock.hxx in Headers */,
......@@ -15447,10 +15447,10 @@
files = (
BE17E7AE1D7EA9E300A1AE6A /* Ale.cpp in Sources */,
BED699FE1D8F2F1500DF55CB /* WriteDataHelper.cpp in Sources */,
BE1D9E4A1DD0D9F200C1D355 /* T22.cpp in Sources */,
BE17E7B01D7EA9E300A1AE6A /* SolidDisplacement.cpp in Sources */,
BE17E7B11D7EA9E300A1AE6A /* LoadOnSolid.cpp in Sources */,
BE17E7B21D7EA9E300A1AE6A /* InitialPorosityValue.cpp in Sources */,
BE71B92B1DB75AE5005DCB59 /* T33.cpp in Sources */,
BE17E7B41D7EA9E300A1AE6A /* Fluidmass.cpp in Sources */,
BE17E7B61D7EA9E300A1AE6A /* Porosity.cpp in Sources */,
BE17E7B71D7EA9E300A1AE6A /* PenalizationPorosity.cpp in Sources */,
......@@ -15461,8 +15461,8 @@
BE17E7C01D7EA9E300A1AE6A /* FluidVelocity.cpp in Sources */,
BE17E7C11D7EA9E300A1AE6A /* Porosity.cpp in Sources */,
BE17E7C31D7EA9E300A1AE6A /* main_st_venant_kirchhoff.cpp in Sources */,
BE1D9E511DD0D9FD00C1D355 /* T22.cpp in Sources */,
BE17E7C51D7EA9E300A1AE6A /* SolidVelocity.cpp in Sources */,
BE71B9371DB75AE5005DCB59 /* T33.cpp in Sources */,
BE17E7C61D7EA9E300A1AE6A /* GradOnGradientBasedElasticityTensor.cpp in Sources */,
BE17E7C71D7EA9E300A1AE6A /* LoadOnSolid.cpp in Sources */,
BE71B90B1DB75AE5005DCB59 /* HybridVector.cpp in Sources */,
......@@ -15796,6 +15796,7 @@
files = (
BE3B35DC1D916E2200DB81A3 /* WriteDataHelper.cpp in Sources */,
BE6FB20C1D8C3BD800B9F0FB /* Monolithic.cpp in Sources */,
BE1D9E501DD0D9FD00C1D355 /* T22.cpp in Sources */,
BE6FB2251D8C3BF300B9F0FB /* Ale.cpp in Sources */,
BE6FB20F1D8C3BD800B9F0FB /* FluidVelocity.cpp in Sources */,
BE6FB2281D8C3BF300B9F0FB /* ScalarDivVectorial.cpp in Sources */,
......@@ -15806,10 +15807,8 @@
BE6FB2211D8C3BF300B9F0FB /* GradOnGradientBasedElasticityTensor.cpp in Sources */,
BE6FB20E1D8C3BD800B9F0FB /* Fluidmass.cpp in Sources */,
BE6FB2231D8C3BF300B9F0FB /* ScalarDivVectorial.cpp in Sources */,
BE71B9361DB75AE5005DCB59 /* T33.cpp in Sources */,
BE6FB22F1D8C3BF300B9F0FB /* PenalizationPorosity.cpp in Sources */,
BE6FB22A1D8C3BF300B9F0FB /* FluidSourceTerm.cpp in Sources */,
BE71B92A1DB75AE5005DCB59 /* T33.cpp in Sources */,
BE6FB20D1D8C3BD800B9F0FB /* SolidDisplacement.cpp in Sources */,
BE6FB2261D8C3BF300B9F0FB /* GradOnGradientBasedElasticityTensor.cpp in Sources */,
BE6FB22E1D8C3BF300B9F0FB /* BulkSolid.cpp in Sources */,
......@@ -15820,6 +15819,7 @@
BE71B9121DB75AE5005DCB59 /* HybridVector.cpp in Sources */,
BE6FB20A1D8C3BCD00B9F0FB /* VariableHolder.cpp in Sources */,
BE6FB2111D8C3BD800B9F0FB /* Porosity.cpp in Sources */,
BE1D9E491DD0D9F200C1D355 /* T22.cpp in Sources */,
BE6FB2271D8C3BF300B9F0FB /* Porosity.cpp in Sources */,
BE71B90A1DB75AE5005DCB59 /* HybridVector.cpp in Sources */,
BE6FB22C1D8C3BF300B9F0FB /* InternalFriction.cpp in Sources */,
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/T33.cpp → Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/T22.cpp
View file @ d5079bde
//! \file
//
//
// T33.cpp
// T22.cpp
// HappyHeart
//
// Created by Sebastien Gilles on 02/05/16.
// Copyright © 2016 Inria. All rights reserved.
//
#include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/T33.hpp"
#include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/T22.hpp"
namespace HappyHeart
......@@ -32,7 +32,7 @@ namespace HappyHeart
{
T33::T33(const TimeManager& time_manager,
T22::T22(const TimeManager& time_manager,
const FEltSpace& felt_space,
const Unknown& velocity,
const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None, 2u>& porosity,
......@@ -52,9 +52,9 @@ namespace HappyHeart
{ }
const std::string& T33::ClassName()
const std::string& T22::ClassName()
{
static std::string name("T33");
static std::string name("T22");
return name;
}
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/T33.hpp → Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/T22.hpp
View file @ d5079bde
//! \file
//
//
// T33.hpp
// T22.hpp
// HappyHeart
//
// Created by Sebastien Gilles on 02/05/16.
// Copyright © 2016 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HPP_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HPP_
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HPP_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HPP_
# include "Parameters/ParameterAtDof.hpp"
# include "Operators/GlobalVariationalOperator/GlobalVariationalOperator.hpp"
# include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T33.hpp"
# include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T22.hpp"
namespace HappyHeart
......@@ -40,23 +40,23 @@ namespace HappyHeart
/*!
* \brief Implementation of global operator that contributes to T33 quadrant in implicit fluid step
* \brief Implementation of global operator that contributes to T22 quadrant in implicit fluid step
* variational formulation.
*
* \todo Improve the comment by writing its mathematical definition!
*/
class T33 final
class T22 final
: public GlobalVariationalOperator
<
T33,
LocalVariationalOperatorNS::T33
T22,
LocalVariationalOperatorNS::T22
>
{
public:
//! Self.
using self = T33;
using self = T22;
//! Returns the name of the operator.
static const std::string& ClassName();
......@@ -66,7 +66,7 @@ namespace HappyHeart
using parent = GlobalVariationalOperator
<
self,
LocalVariationalOperatorNS::T33
LocalVariationalOperatorNS::T22
>;
//! Friendship to the parent class so that the CRTP can reach private methods defined below.
......@@ -85,9 +85,9 @@ namespace HappyHeart
* \brief Constructor.
*
* \copydoc doxygen_hide_quadrature_rule_per_topology_nullptr_arg
* \param[in] mass_factor Factor to use on the mass operator part of T33.
* \param[in] mass_factor Factor to use on the mass operator part of T22.
*/
explicit T33(const TimeManager& time_manager,
explicit T22(const TimeManager& time_manager,
const FEltSpace& felt_space,
const Unknown& unknown,
const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None, 2u>& porosity,
......@@ -96,19 +96,19 @@ namespace HappyHeart
const QuadratureRulePerTopology* const quadrature_rule_per_topology = nullptr);
//! Destructor.
~T33() = default;
~T22() = default;
//! Move constructor.
T33(T33&&) = delete;
T22(T22&&) = delete;
//! Copy constructor.
T33(const T33&) = delete;
T22(const T22&) = delete;
//! Copy affectation.
T33& operator=(const T33&) = delete;
T22& operator=(const T22&) = delete;
//! Move affectation.
T33& operator=(T33&&) = delete;
T22& operator=(T22&&) = delete;
///@}
......@@ -148,7 +148,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances//T33.hxx"
# include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances//T22.hxx"
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HPP_
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HPP_
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/T33.hxx → Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/T22.hxx
View file @ d5079bde
//! \file
//
//
// T33.hxx
// T22.hxx
// HappyHeart
//
// Created by Sebastien Gilles on 02/05/16.
// Copyright © 2016 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HXX_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HXX_
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HXX_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HXX_
namespace HappyHeart
......@@ -35,7 +35,7 @@ namespace HappyHeart
template<class LinearAlgebraTupleT>
inline void T33::Assemble(LinearAlgebraTupleT&& linear_algebra_tuple, const Domain& domain) const
inline void T22::Assemble(LinearAlgebraTupleT&& linear_algebra_tuple, const Domain& domain) const
{
return parent::AssembleImpl(std::move(linear_algebra_tuple), domain);
}
......@@ -57,4 +57,4 @@ namespace HappyHeart
} // namespace HappyHeart
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HXX_
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_GLOBAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HXX_
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T33.cpp → Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T22.cpp
View file @ d5079bde
//! \file
//
//
// T33.cpp
// T22.cpp
// HappyHeart
//
// Created by Sebastien Gilles on 02/05/16.
// Copyright © 2016 Inria. All rights reserved.
//
#include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T33.hpp"
#include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T22.hpp"
namespace HappyHeart
......@@ -32,7 +32,7 @@ namespace HappyHeart
{
T33::T33(const ExtendedUnknown::vector_const_shared_ptr& unknown_list,
T22::T22(const ExtendedUnknown::vector_const_shared_ptr& unknown_list,
elementary_data_type&& a_elementary_data,
const TimeManager& time_manager,
const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None, 2u>& porosity,
......@@ -48,17 +48,17 @@ namespace HappyHeart
}
T33::~T33() = default;
T22::~T22() = default;
const std::string& T33::ClassName()
const std::string& T22::ClassName()
{
static std::string name("T33");
static std::string name("T22");
return name;
}
void T33::ComputeEltArray()
void T22::ComputeEltArray()
{
auto& elementary_data = GetNonCstElementaryData();
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T33.hpp → Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T22.hpp
View file @ d5079bde
//! \file
//
//
// T33.hpp
// T22.hpp
// HappyHeart
//
// Created by Sebastien Gilles on 02/05/16.
// Copyright © 2016 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HPP_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HPP_
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HPP_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HPP_
# include <memory>
# include <vector>
......@@ -46,15 +46,15 @@ namespace HappyHeart
/*!
* \brief Implementation of mass operator.
*/
class T33 final
class T22 final
: public ::HappyHeart::Advanced::LocalVariationalOperatorNS::BilinearLocalVariationalOperator<LocalSymmetricMatrix>,
private Crtp::Porosity<T33>
private Crtp::Porosity<T22>
{
public:
//! \copydoc doxygen_hide_alias_self
using self = T33;
using self = T22;
//! Alias to unique pointer.
using unique_ptr = std::unique_ptr<self>;
......@@ -84,7 +84,7 @@ namespace HappyHeart
* \internal <b><tt>[internal]</tt></b> This constructor must not be called manually: it is involved only in
* GlobalVariationalOperator<DerivedT, LocalVariationalOperatorT>::CreateLocalOperatorList() method.
*/
explicit T33(const ExtendedUnknown::vector_const_shared_ptr& unknown_list,
explicit T22(const ExtendedUnknown::vector_const_shared_ptr& unknown_list,
elementary_data_type&& elementary_data,
const TimeManager& time_manager,
const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None, 2u>& porosity,
......@@ -93,19 +93,19 @@ namespace HappyHeart
//! Destructor.
~T33();
~T22();
//! Copy constructor.
T33(const T33&) = delete;
T22(const T22&) = delete;
//! Move constructor.
T33(T33&&) = delete;
T22(T22&&) = delete;
//! Copy affectation.
T33& operator=(const T33&) = delete;
T22& operator=(const T22&) = delete;
//! Move affectation.
T33& operator=(T33&&) = delete;
T22& operator=(T22&&) = delete;
///@}
......@@ -183,7 +183,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T33.hxx"
# include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T22.hxx"
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HPP_
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HPP_
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T33.hxx → Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T22.hxx
View file @ d5079bde
//! \file
//
//
// T33.hxx
// T22.hxx
// HappyHeart
//
// Created by Sebastien Gilles on 02/05/16.
// Copyright © 2016 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HXX_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HXX_
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HXX_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HXX_
namespace HappyHeart
......@@ -33,19 +33,19 @@ namespace HappyHeart
{
inline const ScalarParameter<>& T33::GetFluidDensity() const noexcept
inline const ScalarParameter<>& T22::GetFluidDensity() const noexcept
{
return fluid_density_;
}
inline double T33::GetInternalFriction() const noexcept
inline double T22::GetInternalFriction() const noexcept
{
return internal_friction_;
}
inline const TimeManager& T33::GetTimeManager() const noexcept
inline const TimeManager& T22::GetTimeManager() const noexcept
{
return time_manager_;
}
......@@ -67,4 +67,4 @@ namespace HappyHeart
} // namespace HappyHeart
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T33_HXX_
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_UNDER_DEVELOPMENT_x_POROMECHANICS_x_IMPLICIT_STEP_x_IMPLICIT_STEP_FLUID_x_NEWTON_FIXED_POINT_x_LOCAL_VARIATIONAL_OPERATOR_INSTANCES_x_T22_HXX_
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/VariationalFormulation.hpp
View file @ d5079bde
......@@ -28,7 +28,7 @@
# include "ModelInstances/UnderDevelopment/Poromechanics/InputParameterList.hpp"
# include "ModelInstances/UnderDevelopment/Poromechanics/GlobalVariationalOperatorInstances/TransientSource.hpp"
# include "ModelInstances/UnderDevelopment/Poromechanics/GlobalVariationalOperatorInstances/ScalarDivVectorial.hpp"
# include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/T33.hpp"
# include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/T22.hpp"
# include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/GlobalVariationalOperatorInstances/Darcy.hpp"
# include "ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/HybridVector.hpp"
......@@ -66,7 +66,7 @@ namespace HappyHeart
all,
all_except_t11, // In Snes, t11 has just been recomputed beforehand for rhs purpose.
t21,
t33_without_dirichlet
t22_without_dirichlet
};
......@@ -278,7 +278,7 @@ namespace HappyHeart
/*!
* \brief Constant accessor to the matrix obtained after convergence of Newton FP
* updated and without Dirichlet condition in T33 block
* updated and without Dirichlet condition in T22 block
*/
const GlobalMatrix& GetMonolithicMatrixAfterNewtonFPWithoutDirichlet() const noexcept;
......@@ -295,7 +295,7 @@ namespace HappyHeart
* \brief Recompute some of the terms of the matrix once the convergence is reached.
*
* \param[out] monolithic_matrix_after_newtonFP Monolithic matrix recomputed after convergence was
* reached. Only blocks T21 and T33 are recomputed.
* reached. Only blocks T21 and T22 are recomputed.
* \param[in] monolithic_matrix_after_newtonFP_without_dirichlet Same as \a
* monolithic_matrix_after_newtonFP without the application of Dirichlet boudary condition.
* \param[in] darcy_vector Darcy vector recomputed after Newton convergence.
......@@ -318,7 +318,7 @@ namespace HappyHeart
/*!
* \brief Non constant accessor to the matrix obtained after convergence of Newton FP
* without Dirichlet condition in T33 block
* without Dirichlet condition in T22 block
*/
GlobalMatrix& GetNonCstMonolithicMatrixAfterNewtonFPWithoutDirichlet() noexcept;