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

Lanczos tests #136

Merged
merged 7 commits into from
Feb 22, 2019
Merged

Lanczos tests #136

merged 7 commits into from
Feb 22, 2019

Conversation

aprokop
Copy link
Collaborator

@aprokop aprokop commented Feb 21, 2019

An alternative version of #132. We don't introduce a new stopping criteria, and instead just loosen tolerance for the hierarchy tests.

Fix #115.

@ghost ghost assigned aprokop Feb 21, 2019
@ghost ghost added the in progress label Feb 21, 2019
@aprokop aprokop mentioned this pull request Feb 21, 2019
@codecov-io
Copy link

codecov-io commented Feb 21, 2019

Codecov Report

Merging #136 into master will increase coverage by 0.75%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #136      +/-   ##
==========================================
+ Coverage   87.04%   87.79%   +0.75%     
==========================================
  Files          53       53              
  Lines        2153     2171      +18     
==========================================
+ Hits         1874     1906      +32     
+ Misses        279      265      -14
Impacted Files Coverage Δ
tests/test_restriction_matrix.cc 97.36% <100%> (ø) ⬆️
include/mfmg/dealii/amge_host.templates.hpp 93.81% <100%> (+14.43%) ⬆️
include/mfmg/dealii/lanczos.templates.hpp 100% <100%> (ø) ⬆️
tests/test_hierarchy.cc 76.78% <100%> (+3.31%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 127a269...88aabb4. Read the comment docs.

@aprokop
Copy link
Collaborator Author

aprokop commented Feb 21, 2019

The tests finally pass.

Copy link
Collaborator

@dalg24 dalg24 left a comment

Choose a reason for hiding this comment

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

Make sure you add a reference to DSTEV before you merge.

include/mfmg/dealii/lanczos.templates.hpp Show resolved Hide resolved
include/mfmg/dealii/lanczos.hpp Show resolved Hide resolved
tests/test_hierarchy.cc Show resolved Hide resolved
@@ -334,6 +340,6 @@ BOOST_AUTO_TEST_CASE(weight_sum, *utf::tolerance(1e-4))
e[i] = 1.;
e.compress(::dealii::VectorOperation::insert);
restrictor_matrix.vmult(ee, e);
BOOST_TEST(ee.l1_norm() == 1.);
BOOST_TEST(ee.l1_norm() == 1., tt::tolerance(2e-4));
Copy link
Collaborator

Choose a reason for hiding this comment

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

So you relaxed the tolerance (x2)? I missed that change. Is that how you got the tests to pass?

Copy link
Collaborator

Choose a reason for hiding this comment

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

c.c. @Rombur who knows the restriction matrix tests better than I do. Is that OK?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I relaxed the tolerance for restriction test, yes. The tolerances that I was getting from the test when running with Lanczos were around 1.1e-4.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Marking it as "resolved". I just want to make sure that Bruno sees that. You don't need to wait for his feedback to merge.

@Rombur Rombur merged commit acfb283 into ORNL-CEES:master Feb 22, 2019
@ghost ghost removed the in progress label Feb 22, 2019
@aprokop aprokop deleted the lanczos_tests_3 branch February 22, 2019 19:27
@dalg24 dalg24 mentioned this pull request Mar 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants