Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixes for triangles.

  • Loading branch information...
commit 75391cef393e35c0e817d6cb31808c5c13a0bd5f 1 parent c1f8dcd
Chris Bradley chrispbradley authored

Showing 1 changed file with 15 additions and 15 deletions. Show diff stats Hide diff stats

  1. +15 15 src/generated_mesh_routines.f90
30 src/generated_mesh_routines.f90
@@ -1638,7 +1638,7 @@ SUBROUTINE GENERATED_MESH_REGULAR_CREATE_FINISH(GENERATED_MESH,MESH_USER_NUMBER,
1638 1638 !Triangular element
1639 1639 !Break the grid square element into 2 triangles. The 2 triangles are
1640 1640 !Element 1: vertices {(0,0);(1,0);(1,1)}
1641   - !Element 2: vertices {(0,0);(0,1);(1,1)}
  1641 + !Element 2: vertices {(0,0);(1,1);(0,1)}
1642 1642 SELECT CASE(BASIS%INTERPOLATION_ORDER(1))
1643 1643 CASE(BASIS_LINEAR_INTERPOLATION_ORDER)
1644 1644 !First sub-element
@@ -1653,8 +1653,8 @@ SUBROUTINE GENERATED_MESH_REGULAR_CREATE_FINISH(GENERATED_MESH,MESH_USER_NUMBER,
1653 1653 !Second sub-element
1654 1654 ne=(grid_ne-1)*ELEMENT_FACTOR+2
1655 1655 ELEMENT_NODES(1)=np
1656   - ELEMENT_NODES(2)=np+TOTAL_NUMBER_OF_NODES_XI(1)
1657   - ELEMENT_NODES(3)=np+1+TOTAL_NUMBER_OF_NODES_XI(1)
  1656 + ELEMENT_NODES(2)=np+1+TOTAL_NUMBER_OF_NODES_XI(1)
  1657 + ELEMENT_NODES(3)=np+TOTAL_NUMBER_OF_NODES_XI(1)
1658 1658 CALL COMPONENT_NODES_TO_USER_NUMBERS(REGULAR_MESH%GENERATED_MESH,basis_idx,ELEMENT_NODES, &
1659 1659 & ELEMENT_NODES_USER_NUMBERS,ERR,ERROR,*999)
1660 1660 CALL MESH_TOPOLOGY_ELEMENTS_ELEMENT_NODES_SET(ne,MESH_ELEMENTS, &
@@ -1675,11 +1675,11 @@ SUBROUTINE GENERATED_MESH_REGULAR_CREATE_FINISH(GENERATED_MESH,MESH_USER_NUMBER,
1675 1675 !Second sub-element
1676 1676 ne=(grid_ne-1)*ELEMENT_FACTOR+2
1677 1677 ELEMENT_NODES(1)=np
1678   - ELEMENT_NODES(2)=np+2*TOTAL_NUMBER_OF_NODES_XI(1)
1679   - ELEMENT_NODES(3)=np+2+2*TOTAL_NUMBER_OF_NODES_XI(1)
1680   - ELEMENT_NODES(4)=np+TOTAL_NUMBER_OF_NODES_XI(1)
  1678 + ELEMENT_NODES(2)=np+2+2*TOTAL_NUMBER_OF_NODES_XI(1)
  1679 + ELEMENT_NODES(3)=np+2*TOTAL_NUMBER_OF_NODES_XI(1)
  1680 + ELEMENT_NODES(4)=np+1+TOTAL_NUMBER_OF_NODES_XI(1)
1681 1681 ELEMENT_NODES(5)=np+1+2*TOTAL_NUMBER_OF_NODES_XI(1)
1682   - ELEMENT_NODES(6)=np+1+TOTAL_NUMBER_OF_NODES_XI(1)
  1682 + ELEMENT_NODES(6)=np+TOTAL_NUMBER_OF_NODES_XI(1)
1683 1683 CALL COMPONENT_NODES_TO_USER_NUMBERS(REGULAR_MESH%GENERATED_MESH,basis_idx,ELEMENT_NODES, &
1684 1684 & ELEMENT_NODES_USER_NUMBERS,ERR,ERROR,*999)
1685 1685 CALL MESH_TOPOLOGY_ELEMENTS_ELEMENT_NODES_SET(ne,MESH_ELEMENTS, &
@@ -1704,14 +1704,14 @@ SUBROUTINE GENERATED_MESH_REGULAR_CREATE_FINISH(GENERATED_MESH,MESH_USER_NUMBER,
1704 1704 !Second sub-element
1705 1705 ne=(grid_ne-1)*ELEMENT_FACTOR+2
1706 1706 ELEMENT_NODES(1)=np
1707   - ELEMENT_NODES(2)=np+3*TOTAL_NUMBER_OF_NODES_XI(1)
1708   - ELEMENT_NODES(3)=np+3+3*TOTAL_NUMBER_OF_NODES_XI(1)
1709   - ELEMENT_NODES(4)=np+TOTAL_NUMBER_OF_NODES_XI(1)
1710   - ELEMENT_NODES(5)=np+2*TOTAL_NUMBER_OF_NODES_XI(1)
1711   - ELEMENT_NODES(6)=np+1+3*TOTAL_NUMBER_OF_NODES_XI(1)
1712   - ELEMENT_NODES(7)=np+2+3*TOTAL_NUMBER_OF_NODES_XI(1)
1713   - ELEMENT_NODES(8)=np+2+2*TOTAL_NUMBER_OF_NODES_XI(1)
1714   - ELEMENT_NODES(9)=np+1+TOTAL_NUMBER_OF_NODES_XI(1)
  1707 + ELEMENT_NODES(2)=np+3+3*TOTAL_NUMBER_OF_NODES_XI(1)
  1708 + ELEMENT_NODES(3)=np+3*TOTAL_NUMBER_OF_NODES_XI(1)
  1709 + ELEMENT_NODES(4)=np+2+2*TOTAL_NUMBER_OF_NODES_XI(1)
  1710 + ELEMENT_NODES(5)=np+1+TOTAL_NUMBER_OF_NODES_XI(1)
  1711 + ELEMENT_NODES(6)=np+2+3*TOTAL_NUMBER_OF_NODES_XI(1)
  1712 + ELEMENT_NODES(7)=np+1+3*TOTAL_NUMBER_OF_NODES_XI(1)
  1713 + ELEMENT_NODES(8)=np+TOTAL_NUMBER_OF_NODES_XI(1)
  1714 + ELEMENT_NODES(9)=np+2*TOTAL_NUMBER_OF_NODES_XI(1)
1715 1715 ELEMENT_NODES(10)=np+1+2*TOTAL_NUMBER_OF_NODES_XI(1)
1716 1716 CALL COMPONENT_NODES_TO_USER_NUMBERS(REGULAR_MESH%GENERATED_MESH,basis_idx,ELEMENT_NODES, &
1717 1717 & ELEMENT_NODES_USER_NUMBERS,ERR,ERROR,*999)

0 comments on commit 75391ce

Please sign in to comment.
Something went wrong with that request. Please try again.