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

merge Develop into main #102

Merged
merged 209 commits into from
Jan 26, 2024
Merged

merge Develop into main #102

merged 209 commits into from
Jan 26, 2024

Conversation

jtencer
Copy link
Contributor

@jtencer jtencer commented Jan 24, 2024

No description provided.

cwschilly and others added 30 commits October 20, 2023 11:27
@cwschilly
#24: add documentation to orthogonalizer and scaler
779cd6d
@cwschilly
#24: isolate classes for this PR
e61c631
@cwschilly
#24: update more documentation
d3dd0b8
@cwschilly
#24: isolate splitter and shifter
d2183c4
@cwschilly
#24: continue isolating specific files
d515db9
@cwschilly
#24: add return type
d1d741d
@cwschilly
#24: update more documentation
9cb235a
@cwschilly
#24: isolate truncater and svd
bef6c5e
@cwschilly
#24: maintain original formatting
0caa545
@cwschilly
#24: provide remaining documentation; remove white space; fix indenta…
fd26e93 
…tion inconsistencies
@cwschilly
#24: isolate sampling and coupler files
d96fd4d
@cwschilly
#24: provide remaining documentation; remove white space; fix indenta…
53d5177 
…tion inconsistencies
@cwschilly
#24: isolate greedy_coupler_base
f5fe5c0
@cwschilly
#24: fix documentation line lengths
febdfe5
@cwschilly
#24: shorten line lengths
2683e9d
@cwschilly
#24: shorten docstring line lengths
ed9eeb8
@cwschilly
#24: shorten line lengths
1d9e5ed
@cwschilly
#24: shorten docstring lengths
e5762ca
@cwschilly
#24: fix typo
5a63300
@cwschilly
#24: fix formatting
47994e9
@cwschilly
#24: fix typo
0506535
Added baseline ECSW capability
5eeae04
Reorganized ecsw.py so that:
f3a7caa 
- The ECSW classes have been changed to helper functions that take
  inputs and an ECSW solver class as inputs.
- the non-negative least squares solver helper function is now a class
  inheriting from an abstract ECSW solver class. This will allow users
to implement their own solver algorithms
Reorganize ESCW functions for easier unit testing
f07dbf2
@cwschilly
#43: add mpi guard marking
6621186
Added tests for baseline ECSW. These currently only test scalar or si…
4f359d7 
…ngle-equation residual snapshots
@cwschilly
#47: put h5py import in try block
937db32
@cwschilly
#47: add h5py to optional dependencies
7b8d61d
@cwschilly
#47: add newline
22bc3db
@fnrizzi
Merge pull request #49 from Pressio/47-h5py-should-be-an-optional-dep…
d96b8a2 
…endency

#47: h5py should be an optional dependency
jtencer and others added 24 commits December 19, 2023 11:57
@jtencer
Merge pull request #87 from Pressio/linting_cleanup
0e2341a 
more style consolidation
break up run_greedy function some
916a675
Merge branch 'develop' into use_sampling_coupler_for_greedy
8ea6335
simplify initialization of samples_left
61bddad
use loops to eliminate duplicate code
feee1a4
@cwschilly
#88: add pytest-timeout to CI
774ef12
@cwschilly
#88: test with very short timeout
ec632f9
@cwschilly
#88: add test that will take a longer time
8ea1866
@cwschilly
#88: remove test case, make timeout 5 min
1c3a1ee
@fnrizzi
Merge pull request #90 from Pressio/88-reduce-timeout-time-for-ci-tests
c6a3a26 
#88: Reduce timeout time for CI tests
@eparish1
Merge pull request #89 from Pressio/use_sampling_coupler_for_greedy
66aa753 
prototype usage of sampling coupler inside greedy coupler
fix exodus outputter
d5c52f0
@jtencer
Merge pull request #93 from Pressio/update_outputter_for_tensor_data
eba9b2c 
fix exodus outputter
@eparish1
92 removed snapshot data
87aeea5
@eparish1
92 removing header import and import from init file for snapshot data
307787f
@eparish1
fixing additional appearence of snapshot_data
1ebe76f
@eparish1
removed unnecessary deep copy
4ed4c3a
@eparish1
Merge pull request #94 from Pressio/92-remove-snapshot-class
8d67bd2 
92 removed snapshot data
@fnrizzi
remove leftover stuff of snapshot class
af1af22
@fnrizzi
Merge pull request #100 from Pressio/remove_demo
086551a 
remove leftover stuff of snapshot class
@fnrizzi
fix truncater
dd1b46e
@fnrizzi
fix shifter
49c23f2
@fnrizzi
fix the others
cfacd0c
@fnrizzi
fix the others
8406e6c
pjb236
pjb236 approved these changes Jan 24, 2024
View reviewed changes
Copy link
Contributor

@pjb236 pjb236 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed that we should push what we have and then update main more frequently.

@eparish1
Merge pull request #101 from Pressio/fix_99
176af0f 
Remove "Abstract" from "AbstractXYZ" class names
@eparish1 eparish1 merged commit f3d0038 into main Jan 26, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pjb236 pjb236 pjb236 approved these changes

@eparish1 eparish1 Awaiting requested review from eparish1

@fnrizzi fnrizzi Awaiting requested review from fnrizzi

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jtencer @pjb236 @eparish1 @cwschilly @fnrizzi