Skip to content

Data projection fix #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrispbradley wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

Data projection fix #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
85a3134
Give the ability to set the projected xi location for data projections.
chrispbradley May 17, 2019
934cfaa
Fix for no error when using wrong projection result routine.
chrispbradley May 18, 2019
ed936d4
Separating out Sobolev smoothing parameters for each direction.
chrispbradley May 21, 2019
65927c7
Fixing fit plus adding specifying fields for export.
chrispbradley Jun 1, 2019
d08ba05
Correct symmetric Hessian entries to avoid NaNs
chrispbradley Jun 2, 2019
b372f22
Adding Sobolev difference smoothing
chrispbradley Jun 4, 2019
249060b
Output number of canceled data points
chrispbradley Jun 7, 2019
fe8d3bd
Fixes to data projection analysis output.
chrispbradley Jun 8, 2019
5817d36
Allow for interpolating a field at a projected data point.
chrispbradley Jun 9, 2019
45f7095
Data field evaluate bug fix.
chrispbradley Jun 9, 2019
e6eed06
Renaming DataProjection_ResultXiGet and DataProjection_ResultXiSet to…
chrispbradley Jun 11, 2019
bd82aae
Bug fix for data point fields in finite elasticity derived variable c…
chrispbradley Jun 12, 2019
b2007c1
Return full deformation gradient tensor
chrispbradley Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/data_projection_access_routines.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ MODULE DataProjectionAccessRoutines
!> \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
!>@{
INTEGER(INTG), PARAMETER :: DATA_PROJECTION_CANCELLED=0 !<Data projection has been cancelled. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_CONVERGED=1 !<Data projection exited due to it being converged \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_BOUNDS=2 !<Data projection exited due to it hitting the bound and continue to travel out of the element. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_MAX_ITERATION=3 !<Data projection exited due to it attaining maximum number of iteration specified by user. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_NO_ELEMENT=4 !<Data projection exited due to no local element found, this happens when none of the candidate elements are within this computational node, and before MPI communication with other nodes. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
INTEGER(INTG), PARAMETER :: DATA_PROJECTION_USER_SPECIFIED=1 !<Data projection was specified by the user. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_CONVERGED=2 !<Data projection exited due to it being converged \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_BOUNDS=3 !<Data projection exited due to it hitting the bound and continue to travel out of the element. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_MAX_ITERATION=4 !<Data projection exited due to it attaining maximum number of iteration specified by user. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_NO_ELEMENT=5 !<Data projection exited due to no local element found, this happens when none of the candidate elements are within this computational node, and before MPI communication with other nodes. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
!>@}

!Module types
Expand All @@ -74,8 +75,8 @@ MODULE DataProjectionAccessRoutines

!Interfaces

PUBLIC DATA_PROJECTION_CANCELLED,DATA_PROJECTION_EXIT_TAG_CONVERGED,DATA_PROJECTION_EXIT_TAG_BOUNDS, &
& DATA_PROJECTION_EXIT_TAG_MAX_ITERATION,DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
PUBLIC DATA_PROJECTION_CANCELLED,DATA_PROJECTION_USER_SPECIFIED,DATA_PROJECTION_EXIT_TAG_CONVERGED, &
& DATA_PROJECTION_EXIT_TAG_BOUNDS,DATA_PROJECTION_EXIT_TAG_MAX_ITERATION,DATA_PROJECTION_EXIT_TAG_NO_ELEMENT

PUBLIC DataProjection_DataPointsGet

Expand Down
2,285 changes: 1,364 additions & 921 deletions src/data_projection_routines.F90
View file
Open in desktop

Large diffs are not rendered by default.

75 changes: 75 additions & 0 deletions src/field_routines.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,6 +1290,8 @@ MODULE FIELD_ROUTINES

PUBLIC FieldVariable_ParameterSetGet

PUBLIC Fields_AddField

PUBLIC Fields_Finalise,Fields_Initialise

PUBLIC MESH_EMBEDDING_PUSH_DATA, MESH_EMBEDDING_PULL_GAUSS_POINT_DATA, FIELD_PARAMETER_SET_GET_GAUSS_POINT_COORD
Expand Down Expand Up @@ -32067,6 +32069,79 @@ END SUBROUTINE FieldVariable_ParameterSetsCopyIfExists
!================================================================================================================================
!

!>Adds a field to a fields list
SUBROUTINE Fields_AddField(fields,field,err,error,*)

!Argument variables
TYPE(FIELDS_TYPE), POINTER :: fields !<A pointer to the fields to add a field to
TYPE(FIELD_TYPE), POINTER :: field !<The field to add
INTEGER(INTG), INTENT(OUT) :: err !<The error code
TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
!Local Variables
INTEGER(INTG) :: fieldIdx
TYPE(FIELD_PTR_TYPE), POINTER :: newFields(:)

ENTERS("Fields_AddField",err,error,*999)

IF(.NOT.ASSOCIATED(field)) CALL FlagError("Field is not associated.",err,error,*999)
IF(.NOT.ASSOCIATED(fields)) THEN
ALLOCATE(fields,STAT=err)
IF(err/=0) CALL FlagError("Could not allocate fields.",err,error,*999)
CALL FIELDS_INITIALISE_GENERIC(fields,err,error,*999)
ENDIF
NULLIFY(newFields)
ALLOCATE(newFields(fields%NUMBER_OF_FIELDS+1),STAT=err)
IF(err/=0) CALL FlagError("Could not allocate new fields.",err,error,*999)
IF(fields%NUMBER_OF_FIELDS>0) THEN
IF(ASSOCIATED(fields%region)) THEN
IF(ASSOCIATED(field%region)) THEN
IF(.NOT.ASSOCIATED(fields%region,field%region)) &
& CALL FlagError("The specified field does not have the same region as the specified fields.",err,error,*999)
ELSE IF(ASSOCIATED(field%INTERFACE)) THEN
CALL FlagError("Can not add a field from an interface to fields that are from a region.",err,error,*999)
ELSE
CALL FlagError("Field does not have an associated region or interface.",err,error,*999)
ENDIF
ELSE IF(ASSOCIATED(fields%INTERFACE)) THEN
IF(ASSOCIATED(field%interface)) THEN
IF(.NOT.ASSOCIATED(fields%interface,field%interface)) &
& CALL FlagError("The specified field does not have the same interface as the specified fields.",err,error,*999)
ELSE IF(ASSOCIATED(field%region)) THEN
CALL FlagError("Can not add a field from a region to fields that are from an interface.",err,error,*999)
ELSE
CALL FlagError("Field does not have an associated region or interface.",err,error,*999)
ENDIF
ELSE
CALL FlagError("Fields does not have a region or interface.",err,error,*999)
ENDIF
ELSE
IF(ASSOCIATED(field%region)) THEN
fields%region=>field%region
ELSE IF(ASSOCIATED(field%INTERFACE)) THEN
fields%interface=>field%interface
ELSE
CALL FlagError("Field does not have an associated region or interface.",err,error,*999)
ENDIF
ENDIF
DO fieldIdx=1,fields%NUMBER_OF_FIELDS
newFields(fieldIdx)%ptr=>fields%fields(fieldIdx)%ptr
ENDDO !fieldIdx
newFields(fields%NUMBER_OF_FIELDS+1)%ptr=>field
IF(ASSOCIATED(fields%fields)) DEALLOCATE(fields%fields)
fields%fields=>newFields
fields%NUMBER_OF_FIELDS=fields%NUMBER_OF_FIELDS+1

EXITS("Fields_AddField")
RETURN
999 ERRORSEXITS("Fields_AddField",err,error)
RETURN 1

END SUBROUTINE Fields_AddField

!
!================================================================================================================================
!

!>Finalises the fields and deallocates all memory.
SUBROUTINE FIELDS_FINALISE(FIELDS,ERR,ERROR,*)

Expand Down
Loading