Skip to content
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

Jump to bottom

Fixing elem export. Match user numbers rather than mesh numbers. #222

Merged
merged 1 commit into from
Nov 22, 2015
Merged

Fixing elem export. Match user numbers rather than mesh numbers. #222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/field_IO_routines.f90
View file
Open in desktop
Expand Up @@ -2539,7 +2539,7 @@ SUBROUTINE FieldIO_ExportElementalGroupHeaderFortran( global_number, MAX_NODE_CO
TYPE(DOMAIN_TYPE), POINTER :: componentDomain !The domain mapping to calculate nodal mappings
TYPE(DOMAIN_ELEMENTS_TYPE), POINTER :: DOMAIN_ELEMENTS ! domain nodes
TYPE(DOMAIN_ELEMENT_TYPE), POINTER :: MAX_NODE_ELEMENT
TYPE(DOMAIN_NODES_TYPE), POINTER :: DOMAIN_NODES ! domain nodes
TYPE(DOMAIN_NODES_TYPE), POINTER :: DOMAIN_NODES,MAX_ELEMENT_DOMAIN_NODES ! domain nodes
TYPE(BASIS_TYPE), POINTER :: BASIS
TYPE(BASIS_PTR_TYPE), ALLOCATABLE :: listScaleBases(:)
TYPE(FIELD_VARIABLE_COMPONENT_TYPE), POINTER :: component
Expand All @@ -2551,6 +2551,7 @@ SUBROUTINE FieldIO_ExportElementalGroupHeaderFortran( global_number, MAX_NODE_CO
INTEGER(INTG) :: nn, nx, ny, nz, NodesX, NodesY, NodesZ, mm, NUM_OF_VARIABLES, MAX_NUM_NODES !NUM_OF_NODES
INTEGER(INTG) :: local_number, interpType, NODE_NUMBER, NODE_NUMBER_COUNTER, NODE_NUMBER_COLLAPSED, NUMBER_OF_ELEMENT_NODES
INTEGER(INTG) :: num_scl, num_node, comp_idx, scaleIndex, scaleIndex1, var_idx, derivativeIndex !value_idx field_idx global_var_idx comp_idx1 ny2
INTEGER(INTG) :: NODE_LOCAL_NUMBER,NODE_USER_NUMBER,MAX_ELEMENT_LOCAL_NUMBER,MAX_ELEMENT_USER_NUMBER
LOGICAL :: SAME_SCALING_SET

ENTERS("FieldIO_ExportElementalGroupHeaderFortran",ERR,ERROR,*999)
Expand Down Expand Up @@ -2596,6 +2597,7 @@ SUBROUTINE FieldIO_ExportElementalGroupHeaderFortran( global_number, MAX_NODE_CO
MAX_NODE_COMP_INDEX=comp_idx
MAX_NODE_ELEMENT => DOMAIN_ELEMENTS%ELEMENTS(local_number)
MAX_NUM_NODES=BASIS%NUMBER_OF_NODES
MAX_ELEMENT_DOMAIN_NODES=>componentDomain%TOPOLOGY%NODES
ENDIF
!IF(.NOT.BASIS%DEGENERATE) THEN
IF(comp_idx == 1) THEN
Expand Down Expand Up @@ -3359,8 +3361,11 @@ SUBROUTINE FieldIO_ExportElementalGroupHeaderFortran( global_number, MAX_NODE_CO
!TODO This assumes nested subsets of nodes, and will therefore break on, e.g., mixed quad and cubic interpolation
DO nn = 1, BASIS%NUMBER_OF_NODES
DO mm = 1, MAX_NODE_ELEMENT%BASIS%NUMBER_OF_NODES
IF( DOMAIN_ELEMENTS%ELEMENTS( local_number )%ELEMENT_NODES( nn ) == &
& MAX_NODE_ELEMENT%ELEMENT_NODES( mm ) ) THEN
NODE_LOCAL_NUMBER = DOMAIN_ELEMENTS%ELEMENTS( local_number )%ELEMENT_NODES( nn )
NODE_USER_NUMBER=DOMAIN_ELEMENTS%DOMAIN%TOPOLOGY%NODES%NODES(NODE_LOCAL_NUMBER)%USER_NUMBER
MAX_ELEMENT_LOCAL_NUMBER = MAX_NODE_ELEMENT%ELEMENT_NODES( mm )
MAX_ELEMENT_USER_NUMBER = MAX_ELEMENT_DOMAIN_NODES%NODES(MAX_ELEMENT_LOCAL_NUMBER)%USER_NUMBER
IF( NODE_USER_NUMBER == MAX_ELEMENT_USER_NUMBER ) THEN
NODE_INDEXES( nn ) = mm
EXIT
ENDIF
Expand Down