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

Adding Quadratic elements to Silo abstract knowledge pool #374

Merged
merged 5 commits into from
Sep 3, 2024
Merged

Adding Quadratic elements to Silo abstract knowledge pool #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dcac772
Adding Quadratic elements to Silo abstract knowledge pool
cessenat May 4, 2024
c93d82c
Updating Fortran constants header for quadratic elts
cessenat May 5, 2024
467c2ae
Extending extface.c::CalcExternalFaces to Quadratic elts, degenerate …
cessenat May 7, 2024
26be529
WS change to trigger CI
markcmiller86 Sep 3, 2024
b3dd355
undu last WS change
markcmiller86 Sep 3, 2024
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
28 changes: 28 additions & 0 deletions src/silo/extface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ CalcExternalFaces(int *zoneList, int nNodes, int lowOffset, int highOffset,
{
switch (shapeType[i])
{
case DB_ZONETYPE_QUAD_TET:
case DB_ZONETYPE_TET:
for (j = 0; j < shapeCnt[i]; j++)
{
Expand All @@ -330,6 +331,7 @@ CalcExternalFaces(int *zoneList, int nNodes, int lowOffset, int highOffset,
iZoneList += 4;
}
break;
case DB_ZONETYPE_QUAD_PYRAMID:
case DB_ZONETYPE_PYRAMID:
for (j = 0; j < shapeCnt[i]; j++)
{
Expand Down Expand Up @@ -358,6 +360,7 @@ CalcExternalFaces(int *zoneList, int nNodes, int lowOffset, int highOffset,
iZoneList += 5;
}
break;
case DB_ZONETYPE_QUAD_PRISM:
case DB_ZONETYPE_PRISM:
for (j = 0; j < shapeCnt[i]; j++)
{
Expand Down Expand Up @@ -388,6 +391,7 @@ CalcExternalFaces(int *zoneList, int nNodes, int lowOffset, int highOffset,
iZoneList += 6;
}
break;
case DB_ZONETYPE_QUAD_HEX:
case DB_ZONETYPE_HEX:
for (j = 0; j < shapeCnt[i]; j++)
{
Expand Down Expand Up @@ -438,6 +442,30 @@ CalcExternalFaces(int *zoneList, int nNodes, int lowOffset, int highOffset,
iZone++;
}
break;
case DB_ZONETYPE_QUAD_BEAM:
for (j = 0; j < shapeCnt[i]; j++)
{
InsertFace(&st, &zoneList[iZoneList], 2, iZone);
iZoneList += shapeSize[i];
iZone++;
}
break;
case DB_ZONETYPE_QUAD_TRIANGLE:
for (j = 0; j < shapeCnt[i]; j++)
{
InsertFace(&st, &zoneList[iZoneList], 3, iZone);
iZoneList += shapeSize[i];
iZone++;
}
break;
case DB_ZONETYPE_QUAD_QUAD:
for (j = 0; j < shapeCnt[i]; j++)
{
InsertFace(&st, &zoneList[iZoneList], 4, iZone);
iZoneList += shapeSize[i];
iZone++;
}
break;
case DB_ZONETYPE_BEAM:
case DB_ZONETYPE_TRIANGLE:
case DB_ZONETYPE_QUAD:
Expand Down
11 changes: 11 additions & 0 deletions src/silo/silo.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,17 @@ typedef struct DBmultimatspecies_ {
#define DB_ZONETYPE_PRISM 36
#define DB_ZONETYPE_HEX 38

/* Definitions for quadratic elements */
#define DB_ZONETYPE_QUAD_BEAM 11

#define DB_ZONETYPE_QUAD_TRIANGLE 25
#define DB_ZONETYPE_QUAD_QUAD 26

#define DB_ZONETYPE_QUAD_TET 118
#define DB_ZONETYPE_QUAD_PYRAMID 120
#define DB_ZONETYPE_QUAD_PRISM 113
#define DB_ZONETYPE_QUAD_HEX 116

typedef struct DBzonelist_ {
int ndims; /* Number of dimensions (2,3) */
int nzones; /* Number of zones in list */
Expand Down
14 changes: 14 additions & 0 deletions src/silo/silo.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,13 @@ C...Parameters.
INTEGER DB_ZONETYPE_PRISM
INTEGER DB_ZONETYPE_PYRAMID
INTEGER DB_ZONETYPE_QUAD
INTEGER DB_ZONETYPE_QUAD_BEAM
INTEGER DB_ZONETYPE_QUAD_HEX
INTEGER DB_ZONETYPE_QUAD_PRISM
INTEGER DB_ZONETYPE_QUAD_PYRAMID
INTEGER DB_ZONETYPE_QUAD_QUAD
INTEGER DB_ZONETYPE_QUAD_TET
INTEGER DB_ZONETYPE_QUAD_TRIANGLE
INTEGER DB_ZONETYPE_TET
INTEGER DB_ZONETYPE_TRIANGLE
INTEGER SILO_VERS_MAJ
Expand Down Expand Up @@ -865,6 +872,13 @@ C...Parameters.
PARAMETER (DB_ZONETYPE_PYRAMID=35)
PARAMETER (DB_ZONETYPE_PRISM=36)
PARAMETER (DB_ZONETYPE_HEX=38)
PARAMETER (DB_ZONETYPE_QUAD_BEAM=11)
PARAMETER (DB_ZONETYPE_QUAD_TRIANGLE=25)
PARAMETER (DB_ZONETYPE_QUAD_QUAD=26)
PARAMETER (DB_ZONETYPE_QUAD_TET=118)
PARAMETER (DB_ZONETYPE_QUAD_PYRAMID=120)
PARAMETER (DB_ZONETYPE_QUAD_PRISM=113)
PARAMETER (DB_ZONETYPE_QUAD_HEX=116)
PARAMETER (DB_MAX_H5_OBJ_VALS=64)
PARAMETER (DB_F77NULLSTRING="NULLSTRING")

Expand Down
7 changes: 7 additions & 0 deletions src/silo/silo_f9x.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,13 @@
integer, parameter :: DB_ZONETYPE_PYRAMID = 35
integer, parameter :: DB_ZONETYPE_PRISM = 36
integer, parameter :: DB_ZONETYPE_HEX = 38
integer, parameter :: DB_ZONETYPE_QUAD_BEAM = 11
integer, parameter :: DB_ZONETYPE_QUAD_TRIANGLE = 25
integer, parameter :: DB_ZONETYPE_QUAD_QUAD = 26
integer, parameter :: DB_ZONETYPE_QUAD_TET = 118
integer, parameter :: DB_ZONETYPE_QUAD_PYRAMID = 120
integer, parameter :: DB_ZONETYPE_QUAD_PRISM = 113
integer, parameter :: DB_ZONETYPE_QUAD_HEX = 116
integer, parameter :: DB_MAX_H5_OBJ_VALS = 64
character (len=10), parameter :: DB_F77NULLSTRING = "NULLSTRING"

Expand Down
8 changes: 8 additions & 0 deletions tools/python/pysilo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,14 @@ void SILOMODULE_API initSilo(void)
ADD_CONSTANT(DB_ZONETYPE_PRISM);
ADD_CONSTANT(DB_ZONETYPE_HEX);

ADD_CONSTANT(DB_ZONETYPE_QUAD_BEAM);
ADD_CONSTANT(DB_ZONETYPE_QUAD_TRIANGLE);
ADD_CONSTANT(DB_ZONETYPE_QUAD_QUAD);
ADD_CONSTANT(DB_ZONETYPE_QUAD_TET);
ADD_CONSTANT(DB_ZONETYPE_QUAD_PYRAMID);
ADD_CONSTANT(DB_ZONETYPE_QUAD_PRISM);
ADD_CONSTANT(DB_ZONETYPE_QUAD_HEX);

#if PY_VERSION_GE(3,0,0)

Py_INCREF(&DBfileType);
Expand Down