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

Jump to bottom

TDycore polymorphism, part 3: separating concerns #215

Merged
merged 75 commits into from
Dec 16, 2021
Merged

TDycore polymorphism, part 3: separating concerns #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
d764715
Started factoring specific discretizations out of TDy.
jeff-cohere Oct 25, 2021
45caf1d
Pushing further. Things aren't getting better yet.
jeff-cohere Oct 25, 2021
16f17f6
Factored out boundary conditions, sources/sinks, and more MPFA-O spec…
jeff-cohere Oct 26, 2021
3903318
Working through MPFA-O mesh issues.
jeff-cohere Oct 27, 2021
efef048
Factored out TDyEOS for density/viscosity/enthalpy calculations.
jeff-cohere Oct 27, 2021
ad47ed5
Adding needed parameters to impl functions.
jeff-cohere Oct 27, 2021
711ddca
Fixing the order in which object files are compiled.
jeff-cohere Oct 27, 2021
eb5cee9
Made some progress on understanding and reorganizing material models.
jeff-cohere Oct 27, 2021
a6321c5
Broke data out of MaterialProp type.
jeff-cohere Oct 29, 2021
dc96251
A suggested design for characteristic curves.
jeff-cohere Oct 31, 2021
87f6905
Reimagined characteristic curves models and started prep for cleanup.
jeff-cohere Nov 1, 2021
6f944f1
Started on the long road back. Reworked Conditions to be like Materia…
jeff-cohere Nov 1, 2021
1e5e8ed
Working through some issues with boundary conditions.
jeff-cohere Nov 1, 2021
ea12571
Documented function registry.
jeff-cohere Nov 1, 2021
e12150f
Repairing finite element implementations.
jeff-cohere Nov 1, 2021
0c8243d
Worked through WY compilation errors, and fixed some oversights in CC.
jeff-cohere Nov 2, 2021
ffc8079
Worked through material property issues and remaining FE stuff.
jeff-cohere Nov 2, 2021
a604ff2
Moving some things around and renaming things.
jeff-cohere Nov 2, 2021
0380d84
Started on Fortran. Going to skip for now.
jeff-cohere Nov 2, 2021
07a69c5
Continuing factor-out of MPFA-O mesh.
jeff-cohere Nov 3, 2021
6bf4937
Consolidated MPFA-O mesh source and shook TDy out of it.
jeff-cohere Nov 3, 2021
c4e0f70
Got through most of tdympfao.c.
jeff-cohere Nov 9, 2021
9f311eb
Continuing on to solver-specific stuff.
jeff-cohere Nov 9, 2021
ea16101
Stopping for now.
jeff-cohere Nov 9, 2021
1cade00
Sifting through and cleaning up some variable names.
jeff-cohere Nov 11, 2021
1a722de
Waded through rest of MPFA-O compile errors.
jeff-cohere Nov 11, 2021
305ceb1
Worked through some remaining issues with material props and BCs.
jeff-cohere Nov 11, 2021
21ed75c
Replaced porosity/permeability assignment logic in I/O system.
jeff-cohere Nov 11, 2021
c29667d
Finished code repairs to dycore. Next up: demos!
jeff-cohere Nov 12, 2021
6471eff
Got through most of steady demo.
jeff-cohere Nov 12, 2021
817dec9
Worked through the rest of the compilation issues in steady.c.
jeff-cohere Nov 12, 2021
eaa2e57
Starting into steady demo runtime issues.
jeff-cohere Nov 15, 2021
cbfedb9
Disabling testing for draft PRs.
jeff-cohere Nov 15, 2021
4b0a111
Disable coverage checks for draft PRs.
jeff-cohere Nov 15, 2021
834ba71
Fixed some glitches in tdywy. Some steady demo runs work now!
jeff-cohere Nov 16, 2021
363d1db
WY steady demo tests pass.
jeff-cohere Nov 16, 2021
dcee7d0
All steady demo tests pass.
jeff-cohere Nov 16, 2021
08e55a0
Fixed first batch of transient demos.
jeff-cohere Nov 16, 2021
b6b7ab8
Enabling F90 module build and laying out an example.
jeff-cohere Nov 17, 2021
190eb48
Wrapped several C functions for F90 module.
jeff-cohere Nov 17, 2021
e238b25
Moved F90 interface C files to f90-mod directory.
jeff-cohere Nov 17, 2021
cafc508
Fixed some compile warnings.
jeff-cohere Nov 17, 2021
162b1a0
Figured out a pattern that allows us to use iso_c_binding.
jeff-cohere Nov 17, 2021
d219675
Cleaned up the Fortran interface a bit.
jeff-cohere Nov 18, 2021
1ce38ea
Reorganized mesh construction code a bit.
jeff-cohere Nov 18, 2021
f63ec85
Found an interopable pattern for using vectorized Fortran functions.
jeff-cohere Nov 19, 2021
01e7328
Proved the Fortran function approach works, and fixed some glitches.
jeff-cohere Nov 19, 2021
ee7220e
Fixed a small bug in TS.
jeff-cohere Nov 19, 2021
706a42a
Plugged several memory leaks.
jeff-cohere Nov 20, 2021
571a37b
Fixed a mesh geometry problem, left notes for remaining issues.
jeff-cohere Nov 20, 2021
ffa6ed9
Added functions for computing characteristic curves on selected point…
jeff-cohere Nov 22, 2021
1e8fc40
Residual saturation is now initialized during TDySetup.
jeff-cohere Nov 22, 2021
a1f12a8
Redid Fortran function registry.
jeff-cohere Nov 23, 2021
60450e0
Removed a print function.
jeff-cohere Nov 23, 2021
dfd10fc
Removed errant unicode character.
jeff-cohere Nov 23, 2021
c277d1b
Simplified characteristic curve point sets/maps.
jeff-cohere Nov 23, 2021
64ba272
Clarified/fixed pointwise characteristic curves functions.
jeff-cohere Nov 23, 2021
abcb890
Getting rid of draft PR logic--seems buggy.
jeff-cohere Nov 23, 2021
390ac96
Got SNES transient MPFA-O demo in shape.
jeff-cohere Nov 23, 2021
8e4fcfc
Changed the name of a function.
jeff-cohere Nov 24, 2021
0db6ed1
Fixed indexing oversights in pointwise characteristic curve updates.
jeff-cohere Nov 24, 2021
c745c21
Fixed several bugs preventing transient_mpfaof90 tests from working.
jeff-cohere Nov 24, 2021
a0435a1
Fixed an indexing problem in a vectorized boundary pressure func.
jeff-cohere Nov 24, 2021
4dd2e60
Fixed TH demo driver.
jeff-cohere Nov 29, 2021
59af1ca
Fixed some issues with the Richards driver.
jeff-cohere Nov 29, 2021
c6f4f12
Fixed Richards driver tests.
jeff-cohere Nov 30, 2021
a0d512b
Got rid of some unnecessary allocations.
jeff-cohere Nov 30, 2021
a344e5e
Some minor print changes.
jeff-cohere Nov 30, 2021
5b3cce4
Commented out functions for reading/writing mesh geometry.
jeff-cohere Dec 1, 2021
26fdc24
Fixed some small oversights in an attempt to chase down the last TH bug.
jeff-cohere Dec 3, 2021
7eb48a8
Committing debugging environment for TH.
jeff-cohere Dec 7, 2021
8f2d046
Added a new op, set_dm_fields, that sets field layouts for each model.
jeff-cohere Dec 8, 2021
46a67f4
Removed debugging prints.
jeff-cohere Dec 8, 2021
6216014
Adding else clauses in reponse to PR comments.
jeff-cohere Dec 16, 2021
fe06c7a
Merge branch 'jeff-cohere/impls-refactor' of github.com:TDycores-Proj…
jeff-cohere Dec 16, 2021
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
2 changes: 2 additions & 0 deletions .github/workflows/auto_pr_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
make -j codecov=1 V=1

- name: Running tests (${{ matrix.build-type }})
#if: github.event.pull_request.draft == false # skip for draft PRs
run: |
set +e # disable "fast fail" (continue on test failures)
num_failures=0
Expand Down Expand Up @@ -64,6 +65,7 @@ jobs:
test $num_failures -eq 0

- name: Evaluating test coverage
#if: github.event.pull_request.draft == false # skip for draft PRs
run: |
lcov --capture --directory . --output-file coverage.info
lcov --list coverage.info # debug info
Expand Down
2 changes: 1 addition & 1 deletion demo/SPE10/steady.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ int main(int argc, char **argv) {
ierr = DMCreateGlobalVector(dm,&F); CHKERRQ(ierr);
ierr = DMCreateMatrix (dm,&K); CHKERRQ(ierr);
ierr = MatSetOption(K,MAT_IGNORE_ZERO_ENTRIES,PETSC_TRUE); CHKERRQ(ierr);
ierr = TDyComputeSystem(tdy,K,F); CHKERRQ(ierr);
ierr = TDyWYComputeSystem(tdy,K,F); CHKERRQ(ierr);

/* Solve system */
KSP ksp;
Expand Down
Loading