Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
17d138b
created BB tetrahedral element (copy-pasted from GL hex), and impleme…
sframba Sep 4, 2024
93a6cb0
Merge branch 'develop' into feature/dgWavePropagator
sframba Sep 4, 2024
aa59ae4
WIP
sframba Sep 9, 2024
1cdec06
Merge branch 'develop' into feature/dgWavePropagator
sframba Sep 9, 2024
5003b82
wip
sframba Oct 25, 2024
c946e78
Merge branch 'develop' into feature/dgWavePropagator
sframba Oct 25, 2024
942ffad
constexpr mass and stiffness terms
sframba Nov 7, 2024
fa02119
wip on surface integrals
sframba Nov 8, 2024
531fd6e
cleanup
sframba Nov 8, 2024
5bd54d9
completed surface integrals
sframba Nov 14, 2024
281c482
added DG formulation to dispatch
sframba Nov 14, 2024
6c15fb7
added BB_Tetrahedron to CMakeFiles
sframba Nov 14, 2024
e6c6262
bugfix part 1
sframba Nov 14, 2024
a3142c9
first compiling version
sframba Nov 15, 2024
fc25d25
Merge branch 'develop' into feature/dgWavePropagator
sframba Nov 15, 2024
988f745
a few changes for compatibility
sframba Nov 15, 2024
aa8fac5
removed DG_FE_TYPES from wave dispatch, will need a new separate head…
sframba Nov 15, 2024
2c7fc6b
removed DG_FE_TYPES from wave dispatch, will need a new separate head…
sframba Nov 15, 2024
9a16e41
Merge branch 'feature/dgWavePropagator' of https://github.com/GEOS-DE…
sframba Nov 15, 2024
46ae275
Merge branch 'develop' into feature/dgWavePropagator
sframba Nov 21, 2024
00a5954
Start dg kernel implementation (new files compiles but does nothing f…
acitrain Nov 22, 2024
8062af5
Merge branch 'feature/dgWavePropagator' of https://github.com/GEOS-DE…
acitrain Nov 22, 2024
69a96b6
Bugfix + xml test
acitrain Nov 25, 2024
3665d81
Bugfix
acitrain Nov 25, 2024
2dbb7b9
Merge branch 'develop' into feature/dgWavePropagator
sframba Nov 26, 2024
2168ee4
Merge branch 'develop' into feature/dgWavePropagator
sframba Dec 2, 2024
811782b
Merge branch 'develop' into feature/dgWavePropagator
sframba Dec 6, 2024
2358458
wip on DG structure initialization
sframba Dec 6, 2024
9d82169
Merge branch 'feature/dgWavePropagator' of https://github.com/GEOS-DE…
sframba Dec 6, 2024
bda8919
Merge branch 'develop' into feature/dgWavePropagator
sframba Dec 11, 2024
ed55edb
compiling errors corrected
sframba Dec 12, 2024
603cb2c
Merge branch 'develop' into feature/dgWavePropagator
sframba Dec 12, 2024
97f846f
changed type of permutation representation (linking error)
sframba Dec 12, 2024
be2ae23
Merge branch 'develop' into feature/dgWavePropagator
acitrain Dec 16, 2024
eee3cf9
Merge branch 'develop' into feature/dgWavePropagator
sframba Jan 7, 2025
071b259
WIP
sframba Jan 7, 2025
31a6364
Start dg kernel
acitrain Jan 8, 2025
8536b15
Merge remote-tracking branch 'refs/remotes/origin/feature/dgWavePropa…
acitrain Jan 8, 2025
cdd45c0
compiling again with gcc 11.4.0
sframba Jan 9, 2025
857f687
Merge branch 'develop' into feature/dgWavePropagator
sframba Jan 9, 2025
e8712fb
Merge remote-tracking branch 'refs/remotes/origin/feature/dgWavePropa…
acitrain Jan 9, 2025
24546d2
Continue dg kernel (flux part) NOT TESTED AND COMPILED
acitrain Jan 16, 2025
4ce701e
modified callback function, added characteristic size computation, ad…
sframba Jan 16, 2025
b2a5116
Merge branch 'feature/dgWavePropagator' of https://github.com/GEOS-DE…
sframba Jan 16, 2025
d1a4718
Merge branch 'develop' into feature/dgWavePropagator
sframba Jan 16, 2025
6021e4d
Merge remote-tracking branch 'refs/remotes/origin/feature/dgWavePropa…
acitrain Jan 16, 2025
2e87255
Compilation error with conditionalLoop
acitrain Jan 20, 2025
3661043
resolved compilation issues
sframba Jan 30, 2025
8327083
Merge branch 'develop' into feature/dgWavePropagator
sframba Jan 30, 2025
a294c95
Fix bug in map computation
acitrain Jan 30, 2025
c808965
Merge remote-tracking branch 'refs/remotes/origin/feature/dgWavePropa…
acitrain Jan 30, 2025
252da89
Bugfix
acitrain Jan 30, 2025
acfcb44
Bugfix
acitrain Jan 30, 2025
948e27b
removed warning on uninitialized variable
sframba Feb 4, 2025
b7ee510
Merge branch 'feature/dgWavePropagator' of https://github.com/GEOS-DE…
sframba Feb 4, 2025
2b3d52b
Fix some bugs
acitrain Feb 5, 2025
2143faf
Merge remote-tracking branch 'refs/remotes/origin/feature/dgWavePropa…
acitrain Feb 5, 2025
c223e57
Merge branch 'develop' into feature/dgWavePropagator
sframba Feb 5, 2025
31b3842
corrected stiffness term
sframba Feb 10, 2025
3f7bfb2
corrected jacobian
sframba Feb 10, 2025
9829af2
Fix compilation bug
acitrain Feb 10, 2025
84ea6d3
Add prepareNextTimeStep routine
acitrain Feb 10, 2025
23ede65
Start debug
acitrain Feb 10, 2025
1ecd46a
Bug fix
acitrain Feb 10, 2025
0c1f069
Merge branch 'develop' into feature/dgWavePropagator
sframba Feb 17, 2025
94d992c
Change after last modification with develop (string_array)
acitrain Mar 10, 2025
285fa25
Merge branch 'develop' into feature/dgWavePropagator
acitrain Mar 11, 2025
d909fce
Merge branch 'develop' into feature/dgWavePropagator
acitrain Mar 12, 2025
b1eee50
Fix some bugs
acitrain Mar 14, 2025
828bb83
Currently debugging (DO NOT COMPILE)
acitrain Mar 31, 2025
625c4d6
Debug
acitrain Mar 31, 2025
6d56903
Current debug
acitrain Apr 2, 2025
6f4b251
First functionnal version of DG (structured mesh)
acitrain Apr 22, 2025
f984020
Cleanup
acitrain Apr 23, 2025
cea869e
Merge branch 'develop' into feature/dgWavePropagator
acitrain Apr 25, 2025
8f3c17b
uncrustify
acitrain Apr 25, 2025
a7db66b
Add last coefficient for DG scheme, test in progress
acitrain May 7, 2025
794086f
Fix bug on GPU + remove temporarily high order for DG
acitrain May 9, 2025
89694af
Bug fix for GPU
acitrain May 9, 2025
f6a74cf
Temporary bug fix for GPU
acitrain May 9, 2025
556329d
Bug fix (GPU)
acitrain May 9, 2025
2f75ec2
GPU bugfix
acitrain May 9, 2025
c5a368d
Merge branch 'develop' into feature/dgWavePropagator
acitrain May 12, 2025
b2e4bac
Enable high order for DG (order 2 for now)
acitrain May 14, 2025
2d13e07
Merge branch 'develop' into feature/dgWavePropagator
acitrain May 15, 2025
ee4d3a6
Bug fix + cleanup
acitrain May 20, 2025
c1baab6
Add density and penalty coefficient + comments
acitrain May 20, 2025
3e13fed
Add accessor for formulation, useful for DG high order
acitrain May 21, 2025
f2867cc
Merge branch 'develop' into feature/dgWavePropagator
acitrain May 23, 2025
7683347
Remove unused variable (fix bug in GPU) + add routine to compute coor…
acitrain May 23, 2025
ddca547
Merge branch 'develop' into feature/dgWavePropagator
acitrain Jun 13, 2025
c546e6c
Enable order 3 for DG
acitrain Jun 13, 2025
1e94676
Comment order 4 and 5 for DG
acitrain Jun 13, 2025
a79d92b
Remove unused code
acitrain Jun 13, 2025
009f2f4
Remove unused code + fix compilation bug in CI
acitrain Jun 13, 2025
65eef9a
Fix compilation bug in CI
acitrain Jun 13, 2025
fbf39a2
Fix CI compilation error
acitrain Jun 16, 2025
4412bab
Fix CI warning
acitrain Jun 16, 2025
fd512a3
Remove unused variables
acitrain Jun 16, 2025
597cbff
Other unused variables
acitrain Jun 16, 2025
217211b
Unused variables
acitrain Jun 16, 2025
778e1d1
Unused variable (clang compilation)
acitrain Jun 17, 2025
0860d88
uncrustify
acitrain Jun 19, 2025
6a5c4f8
Remove dead code + documentation
acitrain Jun 19, 2025
5a8e39a
Documentation
acitrain Jun 19, 2025
9bae525
Add documentation
acitrain Jun 20, 2025
ace853f
uncrustify
acitrain Jun 20, 2025
ccb087d
Change GEOS_UNUSED_PARAM to GEOS_UNSED_VAR for stack in BB_Tetrahedron
acitrain Jun 20, 2025
9c36009
Merge branch 'develop' into feature/dgWavePropagator
acitrain Jun 27, 2025
96fbe20
some changes to avoid compiler errors on old compilers
rrsettgast Jul 7, 2025
1602060
Merge branch 'develop' into feature/dgWavePropagator
rrsettgast Jul 7, 2025
695214e
another try
rrsettgast Jul 7, 2025
6459f5d
Merge branch 'feature/dgWavePropagator' of github.com:GEOS-DEV/GEOS i…
rrsettgast Jul 7, 2025
31474ed
Try to fix compilation bug in CI
acitrain Jul 8, 2025
daf0af5
Fix CI bug on GPU platform
acitrain Jul 8, 2025
ca597e8
uncrustify
acitrain Jul 8, 2025
dc1b0f2
Try to fix bug on GPU CI
acitrain Jul 8, 2025
2fb4eb2
Another try for GPU CI
acitrain Jul 8, 2025
98ee478
Remove some macro (CI bug)
acitrain Jul 8, 2025
81062db
fix some syntax errors
rrsettgast Jul 8, 2025
a597450
Merge branch 'develop' into feature/dgWavePropagator
acitrain Jul 9, 2025
ab0d441
Some fix for CI
acitrain Jul 9, 2025
9f6fc7f
Merge remote-tracking branch 'refs/remotes/origin/feature/dgWavePropa…
acitrain Jul 9, 2025
4b3e305
Other CI bug fix
acitrain Jul 9, 2025
cde52d8
New attempt for CI
acitrain Jul 9, 2025
46c46a2
More fix attempt for GPU CI
acitrain Jul 9, 2025
a6c5bec
Try another fix..
acitrain Jul 9, 2025
f80ed0d
Initial commit
RoyerJu64 Jul 24, 2025
52b6af9
New version for Pyramid element for DG + add unit test
acitrain Aug 19, 2025
c85b2ba
Bug fix in test + cleanup
acitrain Aug 19, 2025
37b253a
Merge branch 'develop' into feature/dgOnPyramid
acitrain Aug 25, 2025
ff13711
uncrustify
acitrain Aug 25, 2025
5e874f2
Validating checks
RoyerJu64 Aug 25, 2025
ac71444
Validating Checks
RoyerJu64 Aug 25, 2025
0212488
Fix GPU bug on CI
acitrain Aug 25, 2025
07decc3
Other GPU bugfix
acitrain Aug 25, 2025
dc704bb
Fix test
acitrain Aug 25, 2025
558d5ee
Bugfix
acitrain Aug 25, 2025
b83cd0e
Try fix for GPU CI
acitrain Aug 26, 2025
e7c00c4
Try to fix CMake error
acitrain Aug 26, 2025
fe1a778
Try to fix cmake error
acitrain Aug 26, 2025
b77bdba
Bugfix
acitrain Aug 26, 2025
11acaa2
Merge branch 'develop' into feature/dgOnPyramid
RoyerJu64 Aug 26, 2025
90ae1ef
Added the stifness matrix calculation
RoyerJu64 Aug 26, 2025
906fa9b
Add test for matrices + cleanup + uncrustify
acitrain Aug 26, 2025
7a5c306
Fix documentation
acitrain Aug 26, 2025
244d402
Fix doc
acitrain Aug 26, 2025
a27f444
Remove unused file
acitrain Aug 26, 2025
f0f9470
Add comment line
acitrain Aug 27, 2025
61e6d2b
Add on the fly computation for VDM matrix
acitrain Aug 28, 2025
51023e6
Revert "Add on the fly computation for VDM matrix"
acitrain Aug 28, 2025
2444886
Merge branch 'develop' into feature/dgOnPyramid
acitrain Aug 28, 2025
7f137d6
Merge branch 'develop' into feature/dgOnPyramid
acitrain Sep 1, 2025
0554108
Merge branch 'develop' into feature/dgOnPyramid
acitrain Sep 1, 2025
1987c62
Merge branch 'develop' into feature/dgOnPyramid
acitrain Sep 2, 2025
9994044
Merge branch 'develop' into feature/dgOnPyramid
acitrain Sep 4, 2025
00635db
Merge branch 'develop' into feature/dgOnPyramid
acitrain Sep 8, 2025
2b9c656
Merge branch 'develop' into feature/dgOnPyramid
acitrain Sep 10, 2025
739dddc
Merge branch 'develop' into feature/dgOnPyramid
acitrain Sep 12, 2025
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
1 change: 1 addition & 0 deletions src/coreComponents/finiteElement/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ set( finiteElement_headers
elementFormulations/LagrangeBasis3GL.hpp
elementFormulations/LagrangeBasis5GL.hpp
elementFormulations/BB_Tetrahedron.hpp
elementFormulations/Pk_Pyramid_BCD.hpp
kernelInterface/InterfaceKernelBase.hpp
kernelInterface/ImplicitKernelBase.hpp
kernelInterface/KernelBase.hpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,6 @@ class BB_Tetrahedron final : public FiniteElementBase
}



/**
* @brief Helper function for loop over barycentric coordinates
* @tparam FUNC the callback function
Expand Down Expand Up @@ -720,7 +719,6 @@ class BB_Tetrahedron final : public FiniteElementBase
} );
}


/**
* @brief Helper function for loop over tet basis functions that have one index in a given set of indices.
* If multiple indices are in the given list, the callback is called multiple times.
Expand Down Expand Up @@ -1068,26 +1066,6 @@ class BB_Tetrahedron final : public FiniteElementBase
computeMassTerm( real64 const (&X)[4][3],
FUNC && func )
{
// real64 detJ = LvArray::math::abs( jacobianDeterminant( X ));
// basisLoop( [&func, &detJ] ( auto const cc1, auto const ii1, auto const jj1, auto const kk1, auto const ll1 )
// {
// constexpr int c1 = cc1;
// constexpr int i1 = ii1;
// constexpr int j1 = jj1;
// constexpr int k1 = kk1;
// constexpr int l1 = ll1;
// //Needed for compilors that do not support constexpr lambdas
// GEOS_UNUSED_VAR( c1, i1, j1, k1, l1 );
// basisLoop( [&func, &detJ] ( auto const c2, auto const ii2, auto const jj2, auto const kk2, auto const ll2 )
// {
// constexpr int i2 = decltype(ii2)::value;
// constexpr int j2 = decltype(jj2)::value;
// constexpr int k2 = decltype(kk2)::value;
// constexpr int l2 = decltype(ll2)::value;
// constexpr real64 val = computeSuperpositionIntegral( i1, j1, k1, l1, i2, j2, k2, l2 );
// func( c1, c2, val * detJ );
// } );
// } );
real64 detJ = LvArray::math::abs( jacobianDeterminant( X ));
basisLoop( [&func, &detJ] ( auto cc1, auto ii1, auto jj1, auto kk1, auto ll1 )
{
Expand Down
Loading