Skip to content

Commit

Permalink
Merge branch 'cgns_agglomeration_fix' into 'master'
Browse files Browse the repository at this point in the history
Bugfix structured cgns without agglomeration.

See merge request hopr/hopr!15
  • Loading branch information
Thomas Bolemann committed Jan 5, 2018
2 parents 0458b33 + e22ccf3 commit 7ce0fe1
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/readin/readin_CGNS.f90
Original file line number Diff line number Diff line change
Expand Up @@ -776,17 +776,17 @@ SUBROUTINE ReadCGNSMeshStruct(FirstElem_in,CGNSFile,CGNSBase,iZone,nZonesGlob,nN
END DO
DEALLOCATE(NodeCoords)

DO k=1,irmax(1)-N,N
DO l=1,irmax(2)-N,N
DO m=1,irmax(3)-N,N
CornerNode(1)%np=>Mnodes(k ,l ,m )%np
CornerNode(2)%np=>Mnodes(k+N,l ,m )%np
CornerNode(3)%np=>Mnodes(k+N,l+N,m )%np
CornerNode(4)%np=>Mnodes(k ,l+N,m )%np
CornerNode(5)%np=>Mnodes(k ,l ,m+N)%np
CornerNode(6)%np=>Mnodes(k+N,l ,m+N)%np
CornerNode(7)%np=>Mnodes(k+N,l+N,m+N)%np
CornerNode(8)%np=>Mnodes(k ,l+N,m+N)%np
DO k=1,irmax(1)-N_loc,N_loc
DO l=1,irmax(2)-N_loc,N_loc
DO m=1,irmax(3)-N_loc,N_loc
CornerNode(1)%np=>Mnodes(k ,l ,m )%np
CornerNode(2)%np=>Mnodes(k+N_loc,l ,m )%np
CornerNode(3)%np=>Mnodes(k+N_loc,l+N_loc,m )%np
CornerNode(4)%np=>Mnodes(k ,l+N_loc,m )%np
CornerNode(5)%np=>Mnodes(k ,l ,m+N_loc)%np
CornerNode(6)%np=>Mnodes(k+N_loc,l ,m+N_loc)%np
CornerNode(7)%np=>Mnodes(k+N_loc,l+N_loc,m+N_loc)%np
CornerNode(8)%np=>Mnodes(k ,l+N_loc,m+N_loc)%np
IF(meshdim.EQ.3)THEN
CALL GetNewHexahedron(CornerNode)
CALL CreateSides(FirstElem_in,.TRUE.)
Expand All @@ -806,7 +806,7 @@ SUBROUTINE ReadCGNSMeshStruct(FirstElem_in,CGNSFile,CGNSBase,iZone,nZonesGlob,nN
IF(useCurveds.AND.MeshIsAlreadyCurved)THEN !read in curvedNodes
FirstElem_in%nCurvedNodes=(N_loc+1)**3
ALLOCATE(FirstElem_in%curvedNode(FirstElem_in%nCurvedNodes))
DO kk=0,N; DO ll=0,N; DO mm=0,N
DO kk=0,N_loc; DO ll=0,N_loc; DO mm=0,N_loc
FirstElem_in%curvedNode(HexaMapInv(kk,ll,mm))%np=>Mnodes(k+kk,l+ll,m+mm)%np
END DO; END DO; END DO
END IF!useCurveds
Expand Down

0 comments on commit 7ce0fe1

Please sign in to comment.