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.

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

Implement ParentElement #18

Merged
merged 26 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
9d62020
reimplement ParentElement and testing
rrsettgast Nov 9, 2023
acfe222
enable 3rd order test of parent element
rrsettgast Nov 9, 2023
832b981
update parent element solutions mathematica file
rrsettgast Nov 9, 2023
8448c08
nested static for impl, no nested execute sequence impl
wrtobin Nov 9, 2023
983caaf
additional nesting unit test
wrtobin Nov 9, 2023
fee829a
modifications to use in practice
wrtobin Nov 9, 2023
21933b9
linear transform using NestedSequenceUtilities
wrtobin Nov 9, 2023
bdae132
format
wrtobin Nov 9, 2023
f3e34ae
bit of cleanup
wrtobin Nov 9, 2023
1dc66e6
cleanup
wrtobin Nov 10, 2023
102f400
IndexType cleanup
wrtobin Nov 10, 2023
74c2f73
index naming
wrtobin Nov 10, 2023
a24d221
differentiate between linearIndex and index flattening operation
wrtobin Nov 10, 2023
3a79985
add to .gitignore
rrsettgast Nov 13, 2023
328fb97
InterpolatedShape::supportLoop (#19)
wrtobin Nov 14, 2023
8fe4fa0
Merge branch 'feature/newParentElementImplementation' of github.com:G…
rrsettgast Nov 14, 2023
e7a129a
Merge branch 'main' into feature/newParentElementImplementation
rrsettgast Nov 30, 2023
ef35118
tried applying some parameter packs in ParentElement functions
rrsettgast Nov 30, 2023
1c1a3c9
fix for runtime device availablity of field values
rrsettgast Nov 30, 2023
0eb4a7f
update LinearTransform::jacobian interface
rrsettgast Dec 1, 2023
ae81a7c
minor stuff
rrsettgast Dec 2, 2023
6c81272
replaced calls to linearIndex() with parameter pack
rrsettgast Dec 3, 2023
4810727
in LinearTransform, change some index names to match with what they a…
rrsettgast Dec 3, 2023
9df28e6
add doxygen
rrsettgast Dec 4, 2023
f529a02
remove old implementation for ParentElement::value and gradient
rrsettgast Dec 6, 2023
4124ac0
more cleanup
rrsettgast Dec 6, 2023
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
build-*
install-*
.DS_Store
.vscode


# Prerequisites
*.d
Expand Down
33 changes: 25 additions & 8 deletions docs/ShivaInterface.plantuml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,24 @@ namespace ShivaInterface {

namespace Geometry {
namespace Cell {
interface Cell {

interface NCube {
Basic geometry for a n-cube
}

interface Tet{
Basic geometry for a triangle
}

interface Pyramid{
Basic geometry for a pyramid
}

interface Wedge{
Basic geometry for a wedge
}

interface MappingData {
This family of classes have a dual role.
There is type information and constexpr quantities for use from the type,
and there is data that is for use when instantiated.
Expand All @@ -19,7 +36,7 @@ interface Cell {
+constexpr int numFaces()
}

class CellTetrahedron_Pyramid_Wedge_Hexahdron {
class LinearTransform {
+using IndexType = int;
+using JacobianType = real64[3][3];
+constexpr bool jacobianIsConstInCell = false;
Expand All @@ -28,7 +45,7 @@ class CellTetrahedron_Pyramid_Wedge_Hexahdron {
+inline vertexCoords( IndexType const vindex, int const component ) override final;
}

class CellHexahedronIJK {
class Scaling {
+using IndexType = <int,int,int>};
+using JacobianType = real64[3];
+constexpr bool jacobianIsConstInCell = true;
Expand All @@ -37,7 +54,7 @@ class CellHexahedronIJK {
+inline vertexCoords( IndexType const vindex, int const component ) override final;
}

class CellHexahedronUniformIJK {
class UniformScaling {
+using IndexType = <int,int,int>};
+using JacobianType = real64;
+constexpr bool jacobianIsConstInCell = true;
Expand All @@ -46,9 +63,9 @@ class CellHexahedronUniformIJK {
+inline vertexCoords( IndexType const vindex, int const component ) override final;
}

Cell <|-- CellTetrahedron_Pyramid_Wedge_Hexahdron
Cell <|--- CellHexahedronIJK
Cell <|---- CellHexahedronUniformIJK
Mapping <|-- UniformScaling
Mapping <|--- Scaling
Mapping <|---- LinearTransform
}


Expand Down Expand Up @@ -179,7 +196,7 @@ note as N1
}
endnote

class ParentElement< FUNCSPACE, CELL, BASIS > {
class ParentElement< CELL, BASIS > {
+using FunctionSpaceType = FUNCSPACE;
+using CellType = CELL;
+using BasisType = BASIS;
Expand Down
Loading