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

Add SoilMoistureProfile and SoilFreeThaw as git submodule in ngen ext… #412

Merged
merged 6 commits into from
May 6, 2022

Conversation

champham
Copy link
Contributor

Add SoilMoistureProfile and SoilFreeThaw as git submodule in ngen external directory.

Additions

  • extern/SoilMoistureProfiles/{README.md,INSTALL.md,SoilMoistureProfiles}
  • extern/SoilFreezeThaw/{README.md,INSTALL.md,SoilFreezeThaw}

Removals

Changes

  • .gitmodules

Testing

  1. Clone the submodules
  2. Build the libsmpbmi and libsftbmi shared libraries

Screenshots

Notes

Todos

Checklist

  • PR has an informative and human-readable title
  • Changes are limited to a single goal (no scope creep)
  • Code can be automatically merged (no conflicts)
  • Code follows project standards (link if applicable)
  • Passes all existing automated tests
  • Any change in functionality is tested
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • Project documentation has been updated (including the "Unreleased" section of the CHANGELOG)
  • Reviewers requested with the Reviewers tool ➡️

Testing checklist (automated report can be put here)

Target Environment support

  • Linux


Before library files can be built, a CMake build system must be generated. E.g.:

cmake -B cmake_build -S .
Copy link
Contributor

Choose a reason for hiding this comment

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

Apparently for this module the command needs to be:

cmake -B cmake_build -S . -DNGEN=1

Otherwise the library tries to find cfe.c and fails to configure.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added -DNGEN=1 for both SoilFreezeThaw and SoilMoistureProfiles INSTALL.md.

.gitmodules Outdated
Comment on lines 39 to 41
[submodule "extern/SoilMoistureProfiles/SoilMoistureProfile"]
path = extern/SoilMoistureProfiles/SoilMoistureProfile
url = https://github.com/NOAA-OWP/SoilMoistureProfiles
Copy link
Contributor

Choose a reason for hiding this comment

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

This is likely to lead to confusion... let's make these all SoilMoistureProfiles (with an s), since that is apparently the name of the repo.

Copy link
Contributor

Choose a reason for hiding this comment

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

Notably, the submodule addition itself probably needs to be changed--I am not sure that just changing the path in this file will suffice...and I'm not sure how to otherwise edit it, it may need to be removed and re-added. (?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I removed and re-added SoilMoistureProfiles.

extern/SoilMoistureProfiles/README.md Show resolved Hide resolved
@mattw-nws
Copy link
Contributor

This is all good now I think... however, can you rebase on master again? There is a fix in master that should make the tests pass.

@champham
Copy link
Contributor Author

champham commented May 6, 2022 via email

@mattw-nws mattw-nws self-requested a review May 6, 2022 13:54
@mattw-nws mattw-nws merged commit 23d4fcb into NOAA-OWP:master May 6, 2022
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