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

SWFlow solver fixes. #1247

Merged
merged 12 commits into from
Mar 5, 2021
Merged

SWFlow solver fixes. #1247

merged 12 commits into from
Mar 5, 2021

Conversation

ejtovar
Copy link
Collaborator

@ejtovar ejtovar commented Feb 20, 2021

Mandatory Checklist

Please ensure that the following criteria are met:

  • Title of pull request describes the changes/features
  • Request at least 2 reviewers
  • If new files are being added, the files are no larger than 100kB. Post the file sizes.
  • Code coverage did not decrease. If this is a bug fix, a test should cover that bug fix. If a new feature is added, a test should be made to cover that feature.
  • New features have appropriate documentation strings (readable by sphinx)
  • Contributor has read and agreed with CONTRIBUTING.md and has added themselves to CONTRIBUTORS.md

As a general rule of thumb, try to follow PEP8 guidelines.

Description

Fixed some bugs in the SWFlow solvers.

@codecov
Copy link

codecov bot commented Feb 21, 2021

Codecov Report

Merging #1247 (cf13816) into main (11d8749) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1247   +/-   ##
=======================================
  Coverage   47.55%   47.56%           
=======================================
  Files          90       90           
  Lines       71766    71776   +10     
=======================================
+ Hits        34130    34140   +10     
  Misses      37636    37636           
Impacted Files Coverage Δ
proteus/SWFlow/SWFlowProblem.py 97.56% <100.00%> (ø)
proteus/SWFlow/models/GN_sw_n.py 94.00% <100.00%> (ø)
proteus/mprans/GN_SW2DCV.py 88.74% <100.00%> (+0.05%) ⬆️
proteus/mprans/SW2DCV.py 91.69% <100.00%> (+0.02%) ⬆️

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 11d8749...cf13816. Read the comment docs.

@ejtovar ejtovar requested a review from cekees February 22, 2021 14:46
@ejtovar
Copy link
Collaborator Author

ejtovar commented Feb 22, 2021

@cekees The hashdist linux build is failing due to urllib being failed to download. Is this part of your changes in your latest PR?

@cekees
Copy link
Member

cekees commented Feb 22, 2021

@cekees The hashdist linux build is failing due to urllib being failed to download. Is this part of your changes in your latest PR?

Yes, it will fix that. That PR is basically ready to go in, I'm just adjusting how we do coverage checking.

Copy link
Member

@cekees cekees left a comment

Choose a reason for hiding this comment

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

This looks great. I'm glad you're keeping both models updated. The only thing I'd like to do different is to got ahead and switch the data files over to git. If you've installed git-lfs and run git lfs install you could do something like the following:

  1. Get the list of files that have changed git diff --name-status origin/main > files.sh
  2. Edit files.sh to remove the names of source files and leave only data files to go under LFS
  3. Do git rm --cached for each file in there and then do git commit to remove them from git
  4. Do git lfs track and git add -f for each file, then git commit.
  5. Do git push and git lfs push to push the data to lfs storage
  6. verify on this PR that the data files now just show up as lfs pointers.
    After they've been added to LFS like they shouldn't require any attention, just git add/commit them as usual and lfs will automatically handle the pointer information that lfs tracks.

@ejtovar
Copy link
Collaborator Author

ejtovar commented Feb 23, 2021

I'll go ahead and do that. I will merge this after we merge your PR.

Copy link
Member

@cekees cekees left a comment

Choose a reason for hiding this comment

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

Looks great. I would do a squash and merge to clean up the history.

@ejtovar ejtovar merged commit 7f4f32b into erdc:main Mar 5, 2021
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.

2 participants