Skip to content

Commit

Permalink
Merge branch 'el-tomo-cynthia'
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrispbradley
chrispbradley committed Nov 18, 2015
2 parents fa4455e + 17f09be commit 024cfc6
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 21 deletions.
19 changes: 13 additions & 6 deletions src/Darcy_pressure_equations_routines.f90
View file
Expand Up @@ -155,7 +155,8 @@ SUBROUTINE DarcyPressure_FiniteElementResidualEvaluate(EQUATIONS_SET,ELEMENT_NUM
IF(ASSOCIATED(EQUATIONS)) THEN
SELECT CASE(EQUATIONS_SET%SPECIFICATION(3))
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE)
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
DEPENDENT_FIELD=>EQUATIONS%INTERPOLATION%DEPENDENT_FIELD
GEOMETRIC_FIELD=>EQUATIONS%INTERPOLATION%GEOMETRIC_FIELD
EQUATIONS_MATRICES=>EQUATIONS%EQUATIONS_MATRICES
Expand Down Expand Up @@ -370,7 +371,8 @@ SUBROUTINE DARCY_PRESSURE_EQUATION_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_S
NUMBER_OF_DIMENSIONS = EQUATIONS_SET%REGION%COORDINATE_SYSTEM%NUMBER_OF_DIMENSIONS
SELECT CASE(EQUATIONS_SET%SPECIFICATION(3))
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE)
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
SELECT CASE(EQUATIONS_SET_SETUP%SETUP_TYPE)
CASE(EQUATIONS_SET_SETUP_INITIAL_TYPE)
SELECT CASE(EQUATIONS_SET_SETUP%ACTION_TYPE)
Expand All @@ -390,7 +392,8 @@ SUBROUTINE DARCY_PRESSURE_EQUATION_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_S
CASE(EQUATIONS_SET_SETUP_DEPENDENT_TYPE)
SELECT CASE(EQUATIONS_SET%SPECIFICATION(3))
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE)
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
NUMBER_OF_COMPONENTS=NUMBER_OF_DIMENSIONS !Solid components
NUMBER_OF_DARCY_COMPONENTS=1 !Only solving for the fluid pressure at the moment
END SELECT
Expand Down Expand Up @@ -598,6 +601,8 @@ SUBROUTINE DARCY_PRESSURE_EQUATION_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_S
NUMBER_OF_SOLID_COMPONENTS=6
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE)
NUMBER_OF_SOLID_COMPONENTS=4
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
NUMBER_OF_SOLID_COMPONENTS=6
CASE DEFAULT
LOCAL_ERROR="The third equations set specification of "// &
& TRIM(NumberToVString(EQUATIONS_SET%SPECIFICATION(3),"*",ERR,ERROR))// &
Expand Down Expand Up @@ -846,7 +851,8 @@ SUBROUTINE DarcyPressure_EquationsSetSolutionMethodSet(EQUATIONS_SET,SOLUTION_ME
END IF
SELECT CASE(EQUATIONS_SET%SPECIFICATION(3))
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE)
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
SELECT CASE(SOLUTION_METHOD)
CASE(EQUATIONS_SET_FEM_SOLUTION_METHOD)
EQUATIONS_SET%SOLUTION_METHOD=EQUATIONS_SET_FEM_SOLUTION_METHOD
Expand Down Expand Up @@ -907,8 +913,9 @@ SUBROUTINE DarcyPressure_EquationsSetSpecificationSet(equationsSet,specification
subtype=specification(3)
SELECT CASE(subtype)
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE)
!ok
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
!ok
CASE DEFAULT
localError="The third equations set specification of "//TRIM(NumberToVstring(specification(3),"*",err,error))// &
& " is not valid for a Darcy pressure type of a fluid mechanics equations set."
Expand Down
3 changes: 2 additions & 1 deletion src/equations_set_constants.f90
View file
Expand Up @@ -135,7 +135,8 @@ MODULE EQUATIONS_SET_CONSTANTS
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE=15
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE=16
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_CONSTITUTIVE_LAW_IN_CELLML_EVALUATE_SUBTYPE=17
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE=19
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE=19
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE=18
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_TRANSVERSE_ISOTROPIC_POLYNOMIAL_SUBTYPE=20
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE=21
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_NEARLY_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE=22
Expand Down
3 changes: 2 additions & 1 deletion src/finite_elasticity_fluid_pressure_routines.f90
View file
Expand Up @@ -109,7 +109,8 @@ SUBROUTINE FinElasticityFluidPressure_EquationsSetSolnMethodSet(EQUATIONS_SET,SO
END IF
SELECT CASE(EQUATIONS_SET%SPECIFICATION(3))
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE)
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
SELECT CASE(SOLUTION_METHOD)
CASE(EQUATIONS_SET_FEM_SOLUTION_METHOD)
EQUATIONS_SET%SOLUTION_METHOD=EQUATIONS_SET_FEM_SOLUTION_METHOD
Expand Down
82 changes: 69 additions & 13 deletions src/finite_elasticity_routines.f90
View file
Expand Up @@ -1395,7 +1395,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,ELEMENT_
!Set flags for coupled finite elasticity and Darcy problems
!Check if we need Darcy materials field for Density
IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE .OR. &
& EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE) THEN
& EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE .OR. &
& EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE) THEN
DARCY_DENSITY=.TRUE.
ELSE
DARCY_DENSITY=.FALSE.
Expand Down Expand Up @@ -2139,6 +2140,7 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,ELEMENT_
& EQUATIONS_SET_ELASTICITY_DARCY_INRIA_MODEL_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE, &
& EQUATIONS_SET_NEARLY_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE)
!compressible problem (no pressure component)

Expand Down Expand Up @@ -2369,6 +2371,7 @@ SUBROUTINE FiniteElasticity_FiniteElementPreResidualEvaluate(EQUATIONS_SET,ERR,E
& EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE, &
& EQUATIONS_SET_TRANSVERSE_ISOTROPIC_HUMPHREY_YIN_SUBTYPE, &
& EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE,EQUATIONS_SET_1D3D_MONODOMAIN_ELASTICITY_SUBTYPE, &
& EQUATIONS_SET_MONODOMAIN_ELASTICITY_W_TITIN_SUBTYPE,EQUATIONS_SET_MONODOMAIN_ELASTICITY_VELOCITY_SUBTYPE, &
Expand Down Expand Up @@ -2434,7 +2437,9 @@ SUBROUTINE FiniteElasticity_FiniteElementPostResidualEvaluate(EQUATIONS_SET,ERR,
& EQUATIONS_SET_INCOMPRESSIBLE_ELAST_MULTI_COMP_DARCY_SUBTYPE,EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
& EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE,EQUATIONS_SET_TRANSVERSE_ISOTROPIC_HUMPHREY_YIN_SUBTYPE,&
& EQUATIONS_SET_TRANSVERSE_ISOTROPIC_HUMPHREY_YIN_SUBTYPE,&
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE, &
& EQUATIONS_SET_CONSTITUTIVE_LAW_IN_CELLML_EVALUATE_SUBTYPE, &
& EQUATIONS_SET_HOLZAPFEL_OGDEN_ACTIVECONTRACTION_SUBTYPE, &
& EQUATIONS_SET_CONSTITUTIVE_AND_GROWTH_LAW_IN_CELLML_SUBTYPE)
Expand Down Expand Up @@ -3839,6 +3844,7 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
!C(8)=c5_m2...power coefficient (Markert model) material 2
!C(9)=alpha...activation parameter [0,1]
!C(10)=trans...transition parameter [0,1] for the portion between the two materials
!C(11)=P_max...maximum isometric stress

!Weighting the Mooney Rivlin parameters and obtaining resulting c1 and c2
VAL1=C(1)*C(10)+C(5)*(1.0_DP-C(10))
Expand All @@ -3856,17 +3862,17 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
PIOLA_TENSOR(3,3)=2.0_DP*(VAL1+VAL2*(AZL(1,1)+AZL(2,2))+P*AZU(3,3))

!passive anisotropic part -- only in the tension range (Markert)
IF(AZL(1,1) > 1.0_DP) THEN
VAL1=C(3)/AZL(1,1)*(AZL(1,1)**(C(4)/2.0_DP)-1.0_DP)
VAL2=C(7)/AZL(1,1)*(AZL(1,1)**(C(8)/2.0_DP)-1.0_DP)
IF(AZL(1,1) > 1.0_DP) THEN
VAL1=C(3)/AZL(1,1)*(AZL(1,1)**(C(4)/2)-1)
VAL2=C(7)/AZL(1,1)*(AZL(1,1)**(C(8)/2)-1)
PIOLA_TENSOR(1,1)=PIOLA_TENSOR(1,1)+(VAL1*C(10)+VAL2*(1.0_DP-C(10)))
ENDIF
ENDIF

!active part
IF((SQRT(AZL(1,1))>0.84_DP).AND.(SQRT(AZL(1,1))<1.96_DP)) THEN
VALUE=(-25.0_DP/4.0_DP*AZL(1,1)/1.4/1.4 + 25.0_DP/2.0_DP*SQRT(AZL(1,1))/1.4_DP - 5.25_DP)
VALUE=VALUE*(1/SQRT(AZL(1,1)))*300000000.0_DP*C(9)*C(10) ! P_max here as a constant
ENDIF
IF((SQRT(AZL(1,1))>0.84_DP).AND.(SQRT(AZL(1,1))<1.96_DP)) THEN
VALUE=(-25.0_DP/4.0_DP*AZL(1,1)/1.4/1.4 + 25.0_DP/2.0_DP*SQRT(AZL(1,1))/1.4_DP - 5.25_DP)
VALUE=VALUE*(1/SQRT(AZL(1,1)))*C(9)*C(10)*C(11)
ENDIF

CASE(EQUATIONS_SET_ISOTROPIC_EXPONENTIAL_SUBTYPE)
!Form of constitutive model is:
Expand Down Expand Up @@ -3924,6 +3930,46 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
PIOLA_TENSOR=C(2)*TEMPTERM*IDENTITY + C(3)*TEMPTERM*(I1*IDENTITY-AZLT) - (C(2)+2.0_DP*C(3))*TEMPTERM*AZUT
PIOLA_TENSOR=PIOLA_TENSOR - DARCY_DEPENDENT_INTERPOLATED_POINT%VALUES(1,NO_PART_DERIV)*Jznu*AZU

CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
! See Holmes MH, Mow VC. The nonlinear characteristics of soft gels and hydrated connective tissues in ultrafiltration.
! Journal of Biomechanics. 1990;23(11):1145-1156. DOI: 10.1016/0021-9290(90)90007-P
! The form of constitutive relation is:
! sigma = sigma^s + sigma^f
! sigma^f = -phi^f p I
! sigma^s = -phi^s p I + rho_0^s sigma^s_E
! sigma^s_E is the effective Cauchy stress obtained by differentiating
! the free energy function to get the second Piola-Kirchoff stress tensor:
! rho_0^s W^s = c0 exp(c1(I1 - 3) + c2(I2 - 3)) / (I_3^(c1 + 2c2))
! Rather than add the "phi^s p I" term to the Cauchy stress, we add it here as "phi^s p J C^-1"
! We also set rho_0^s = the solid density * initial solidity, and move the solidity
! inside the strain energy density function
!
! c0 = C(1)
! c1 = C(2)
! c2 = C(3)
! phi^s_0 = C(4)
! alpha = C(5) (activation level)
! P_max = C(6) (maximum isometric active stress)

CALL MATRIX_TRANSPOSE(AZL,AZLT,ERR,ERROR,*999)
CALL MATRIX_TRANSPOSE(AZU,AZUT,ERR,ERROR,*999)
I1=AZL(1,1)+AZL(2,2)+AZL(3,3)
TEMP=MATMUL(AZL,AZL)
I2=0.5_DP*(I1**2.0_DP-TEMP(1,1)-TEMP(2,2)-TEMP(3,3))
!I3 already defined

TEMPTERM=2.0_DP*C(4)*C(1)*EXP(C(2)*(I1 - 3.0_DP) + C(3)*(I2 - 3.0_DP)) / (I3**(C(2)+2.0_DP*C(3)))
PIOLA_TENSOR=C(2)*TEMPTERM*IDENTITY + C(3)*TEMPTERM*(I1*IDENTITY-AZLT) - (C(2)+2.0_DP*C(3))*TEMPTERM*AZUT
PIOLA_TENSOR=PIOLA_TENSOR - DARCY_DEPENDENT_INTERPOLATED_POINT%VALUES(1,NO_PART_DERIV)*Jznu*AZU

IF((SQRT(AZL(1,1))>0.72_DP).AND.(SQRT(AZL(1,1))<1.68_DP)) THEN
VALUE=(-25.0_DP/4.0_DP*AZL(1,1)/1.2_DP/1.2_DP + 25.0_DP/2.0_DP*SQRT(AZL(1,1))/1.2_DP - 5.25_DP)
ELSE
VALUE=0.0_DP
END IF

PIOLA_TENSOR(1,1) = PIOLA_TENSOR(1,1) + 1.0_DP/SQRT(AZL(1,1))*C(5)*C(6)*VALUE

CASE(EQUATIONS_SET_STVENANT_KIRCHOFF_ACTIVECONTRACTION_SUBTYPE)
! For of constitutive model is:
! W = 0.5lambda*tr(E)^2 + mu*tr(E^2)
Expand Down Expand Up @@ -4653,6 +4699,7 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
& .AND. EQUATIONS_SET_SUBTYPE/=EQUATIONS_SET_ELASTICITY_DARCY_INRIA_MODEL_SUBTYPE &
& .AND. EQUATIONS_SET_SUBTYPE/=EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE &
& .AND. EQUATIONS_SET_SUBTYPE/=EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE &
& .AND. EQUATIONS_SET_SUBTYPE/=EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE &
& .AND. EQUATIONS_SET_SUBTYPE/=EQUATIONS_SET_NEARLY_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE

NUMBER_OF_DIMENSIONS = EQUATIONS_SET%REGION%COORDINATE_SYSTEM%NUMBER_OF_DIMENSIONS
Expand Down Expand Up @@ -4684,6 +4731,7 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
& EQUATIONS_SET_CONSTITUTIVE_LAW_IN_CELLML_EVALUATE_SUBTYPE, &
& EQUATIONS_SET_CONSTITUTIVE_AND_GROWTH_LAW_IN_CELLML_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE,EQUATIONS_SET_TRANSVERSE_ISOTROPIC_HUMPHREY_YIN_SUBTYPE, &
& EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE,EQUATIONS_SET_1D3D_MONODOMAIN_ELASTICITY_SUBTYPE, &
& EQUATIONS_SET_MONODOMAIN_ELASTICITY_W_TITIN_SUBTYPE,EQUATIONS_SET_MONODOMAIN_ELASTICITY_VELOCITY_SUBTYPE, &
Expand Down Expand Up @@ -4767,6 +4815,7 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
& EQUATIONS_SET_MEMBRANE_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE, &
& EQUATIONS_SET_NEARLY_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE)
! pass, fibre field isn't required as the constitutive relation is isotropic
CASE(EQUATIONS_SET_ORTHOTROPIC_MATERIAL_COSTA_SUBTYPE, &
Expand Down Expand Up @@ -5557,7 +5606,8 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
! Shared Dependent field setup for multi-physics: elasticity coupled with Darcy fluid pressure
!---------------------------------------------------------------------------------------------
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE)
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
NUMBER_OF_DARCY_COMPONENTS=1 !Only solving for the fluid pressure at the moment
SELECT CASE(EQUATIONS_SET_SETUP%ACTION_TYPE)
CASE(EQUATIONS_SET_SETUP_START_ACTION)
Expand Down Expand Up @@ -6593,7 +6643,7 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
CASE(EQUATIONS_SET_ANISOTROPIC_POLYNOMIAL_ACTIVE_SUBTYPE)
NUMBER_OF_COMPONENTS = 12;
CASE(EQUATIONS_SET_TRANS_ISOTROPIC_ACTIVE_TRANSITION_SUBTYPE)
NUMBER_OF_COMPONENTS = 10;
NUMBER_OF_COMPONENTS = 11;
CASE(EQUATIONS_SET_ORTHOTROPIC_MATERIAL_COSTA_SUBTYPE,EQUATIONS_SET_ACTIVECONTRACTION_SUBTYPE)
NUMBER_OF_COMPONENTS = 7;
CASE(EQUATIONS_SET_COMPRESSIBLE_FINITE_ELASTICITY_SUBTYPE,EQUATIONS_SET_COMPRESSIBLE_ACTIVECONTRACTION_SUBTYPE,&
Expand All @@ -6616,6 +6666,9 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE)
NUMBER_OF_COMPONENTS = 4
NUMBER_OF_FLUID_COMPONENTS=8
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
NUMBER_OF_COMPONENTS = 6
NUMBER_OF_FLUID_COMPONENTS = 8
CASE(EQUATIONS_SET_CONSTITUTIVE_LAW_IN_CELLML_EVALUATE_SUBTYPE)
CALL FlagError("Materials field is not required for CellML based constituative laws.",err,error,*999)
CASE(EQUATIONS_SET_CONSTITUTIVE_AND_GROWTH_LAW_IN_CELLML_SUBTYPE)
Expand Down Expand Up @@ -6932,7 +6985,8 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
CALL EQUATIONS_MAPPING_CREATE_START(EQUATIONS,EQUATIONS_MAPPING,ERR,ERROR,*999)
SELECT CASE(EQUATIONS_SET_SUBTYPE)
CASE(EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE)
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE)
!Residual vector also depends on the fluid pressure variable
CALL EquationsMapping_ResidualVariablesNumberSet(EQUATIONS_MAPPING,2,ERR,ERROR,*999)
CALL EquationsMapping_ResidualVariableTypesSet(EQUATIONS_MAPPING, &
Expand Down Expand Up @@ -7154,6 +7208,7 @@ SUBROUTINE FiniteElasticity_EquationsSetSolutionMethodSet(EQUATIONS_SET,SOLUTION
& EQUATIONS_SET_CONSTITUTIVE_AND_GROWTH_LAW_IN_CELLML_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE, &
& EQUATIONS_SET_TRANSVERSE_ISOTROPIC_HUMPHREY_YIN_SUBTYPE, &
& EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE,EQUATIONS_SET_1D3D_MONODOMAIN_ELASTICITY_SUBTYPE, &
& EQUATIONS_SET_MONODOMAIN_ELASTICITY_W_TITIN_SUBTYPE,EQUATIONS_SET_MONODOMAIN_ELASTICITY_VELOCITY_SUBTYPE, &
Expand Down Expand Up @@ -7238,6 +7293,7 @@ SUBROUTINE FiniteElasticity_EquationsSetSpecificationSet(equationsSet,specificat
& EQUATIONS_SET_CONSTITUTIVE_AND_GROWTH_LAW_IN_CELLML_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
& EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE, &
& EQUATIONS_SET_TRANSVERSE_ISOTROPIC_HUMPHREY_YIN_SUBTYPE, &
& EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE,EQUATIONS_SET_1D3D_MONODOMAIN_ELASTICITY_SUBTYPE, &
& EQUATIONS_SET_MONODOMAIN_ELASTICITY_W_TITIN_SUBTYPE,EQUATIONS_SET_MONODOMAIN_ELASTICITY_VELOCITY_SUBTYPE, &
Expand Down

0 comments on commit 024cfc6

Please sign in to comment.