Skip to content

Commit

Permalink
Adding EQUATIONS_SET_FIBRE_FITTING_EQUATION_TYPE
Browse files Browse the repository at this point in the history
  • Loading branch information
@PrasadBabarendaGamage
PrasadBabarendaGamage committed Jun 3, 2018
1 parent 9b4d9c0 commit 3c7f4ac
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/equations_set_constants.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ MODULE EquationsSetConstants
!Fitting class
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_DATA_FITTING_EQUATION_TYPE=1
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_GAUSS_FITTING_EQUATION_TYPE=2
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_FIBRE_FITTING_EQUATION_TYPE=3

This comment has been minimized.

Sign in to view

Copy link
@chrispbradley

chrispbradley Jun 3, 2018

Member

Hmmm, on second thought (and another reason why we need #56), there is nothing in the fibre fit at the distinction level of data/gauss fitting i.e., we can define the fibre fit objective exactly the same for data points and Gauss points. The data/Gauss is just where the data is located. The fibre fit objective thus needs to be at a level below this? Maybe

equationsSetSpecification = [iron.EquationsSetClasses.FITTING,
iron.EquationsSetTypes.DATA_FITTING_EQUATION,
iron.EquationsSetSubtypes.DIFFUSION_TENSOR_FIBRE_FITTING,
iron.EquationsSetFittingSmoothingTypes.SOBOLEV_VALUE]

This comment has been minimized.

Sign in to view

Copy link
@PrasadBabarendaGamage

PrasadBabarendaGamage Jun 3, 2018

Author Contributor

Yup, I was thinking this as it would involve quite a lot of code duplication, but was thinking to keep it general. Yup will do as you suggest - should simplify things a bit.
!Multi physics class
INTEGER(INTG), PARAMETER :: EQUATIONS_SET_FINITE_ELASTICITY_DARCY_TYPE=1
Expand Down
2 changes: 2 additions & 0 deletions src/opencmiss_iron.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2477,6 +2477,7 @@ MODULE OpenCMISS_Iron
INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_LINEAR_ELASTIC_MODAL_TYPE = EQUATIONS_SET_LINEAR_ELASTIC_MODAL_TYPE !<Linear elasticity modal equations set type \see OpenCMISS_EquationsSetTypes,OpenCMISS
INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DATA_FITTING_EQUATION_TYPE = EQUATIONS_SET_DATA_FITTING_EQUATION_TYPE !<Data point fitting equations set type \see OpenCMISS_EquationsSetTypes,OpenCMISS
INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_GAUSS_FITTING_EQUATION_TYPE = EQUATIONS_SET_GAUSS_FITTING_EQUATION_TYPE !<Gauss point fitting equations set type \see OpenCMISS_EquationsSetTypes,OpenCMISS
INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_FIBRE_FITTING_EQUATION_TYPE = EQUATIONS_SET_FIBRE_FITTING_EQUATION_TYPE !<Fibre point fitting equations set type \see OpenCMISS_EquationsSetTypes,OpenCMISS
INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_FINITE_ELASTICITY_DARCY_TYPE = EQUATIONS_SET_FINITE_ELASTICITY_DARCY_TYPE !<Finite Elasticity Darcy equations set type \see OpenCMISS_EquationsSetTypes,OpenCMISS
INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_FINITE_ELASTICITY_STOKES_TYPE = EQUATIONS_SET_FINITE_ELASTICITY_STOKES_TYPE !<Finite Elasticity Stokes equations set type \see OpenCMISS_EquationsSetTypes,OpenCMISS
INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_FINITE_ELASTICITY_NAVIER_STOKES_TYPE = &
Expand Down Expand Up @@ -3056,6 +3057,7 @@ MODULE OpenCMISS_Iron
& CMFE_EQUATIONS_SET_BIDOMAIN_EQUATION_TYPE, &
& CMFE_EQUATIONS_SET_LINEAR_ELASTIC_MODAL_TYPE, &
& CMFE_EQUATIONS_SET_DATA_FITTING_EQUATION_TYPE,CMFE_EQUATIONS_SET_GAUSS_FITTING_EQUATION_TYPE, &
& CMFE_EQUATIONS_SET_FIBRE_FITTING_EQUATION_TYPE, &
& CMFE_EQUATIONS_SET_MONODOMAIN_STRANG_SPLITTING_EQUATION_TYPE

PUBLIC CMFE_EQUATIONS_SET_FINITE_ELASTICITY_DARCY_TYPE, &
Expand Down

0 comments on commit 3c7f4ac

Please sign in to comment.