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

Adding the aorc_bmi to cfe/extern/aorc_bmi and deleting correspon… #78

Merged
merged 11 commits into from
Apr 20, 2023

Conversation

WanruWu-NOAA
Copy link
Contributor

@WanruWu-NOAA WanruWu-NOAA commented Feb 27, 2023

This PR is for adding the aorc_bmi to cfe/extern/forcing_code and deleting corresponding src and include files in cfe/forcing_code.

Additions

  1. Added the new file: .gitmodules
  2. Added the new folder/files: extern/forcing_code/
  • added: include/aorc.h
  • added: include/aorc_tools.h
  • added: include/bmi_aorc.h
  • added: include/bmi.h
  • added: src/aorc.c
  • added: src/bmi_aorc.c

Removals

  1. Deleted corresponding include files:
  • deleted: forcing_code/include/aorc.h
  • deleted: forcing_code/include/aorc_tools.h
  • deleted: forcing_code/include/bmi_aorc.h
  1. Deleted corresponding src files:
  • deleted: forcing_code/src/aorc.c
  • deleted: forcing_code/src/bmi_aorc.c

Changes

  1. Corresponding file path modifications:
  • modified: CMakeLists.txt
  • modified: README.md
  • modified: src/main_cfe_aorc_pet.c
  • modified: src/main_cfe_aorc_pet_rz_aet.cxx
  • modified: src/main_pass_forcings.c
  1. Reflecting the aorc.c update in the aorc_bmi repo:
  • updated: extern/forcing_code (updated src/aorc.c)

Testing

  mkdir build
  cd build
  cmake .. -DFORCING=ON
  make
  cd ..
  ./run_cfe.sh FORCING

and

  mkdir build
  cd build
  cmake .. -DFORCINGPET=ON
  make
  cd ..
  ./run_cfe.sh FORCINGPET

Screenshots

Notes

Todos

Checklist

  • [x ] PR has an informative and human-readable title
  • [x ] 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
  • Visually tested in supported browsers and devices (see checklist below 👇)
  • Project documentation has been updated (including the "Unreleased" section of the CHANGELOG)
  • Reviewers requested with the Reviewers tool ➡️

Testing checklist

Target Environment support

  • Windows
  • [x ] Linux
  • Browser

Accessibility

  • Keyboard friendly
  • Screen reader friendly

Other

  • Is useable without CSS
  • Is useable without JS
  • Flexible from small to large screens
  • No linting errors or warnings
  • JavaScript tests are passing

…ding src and include files in cfe/forcing_code
.gitmodules Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
src/main_cfe_aorc_pet.c Outdated Show resolved Hide resolved
src/main_cfe_aorc_pet_rz_aet.cxx Outdated Show resolved Hide resolved
src/main_pass_forcings.c Outdated Show resolved Hide resolved
src/main_cfe_aorc_pet.c Outdated Show resolved Hide resolved
@ajkhattak
Copy link
Contributor

@WanruWu-NOAA the PR looks good, just make sure to update your aorc_bmi.c and extern/forcing_code to extern/aorc_bmi to make the submodules' names consistent with other OWP repos.

@ajkhattak
Copy link
Contributor

and as always, let me know if you need my help.

@WanruWu-NOAA
Copy link
Contributor Author

WanruWu-NOAA commented Mar 7, 2023

We'll update bmi_aorc.c on aorc_bmi repo and test it further. This PR and PR#79 had been tested working well with the current bmi_aorc.c from aorc_bmi repo.

@WanruWu-NOAA
Copy link
Contributor Author

@ajkhattak @SnowHydrology I've just submitted a PR for updating bmi_aorc.c on the aorc_bmi repo after I tested this change with current PR and PR#79 - they both worked fine with path modification from #include "../../include/bmi.h" to #include "../include/bmi.h"

@WanruWu-NOAA
Copy link
Contributor Author

WanruWu-NOAA commented Apr 18, 2023

@ajkhattak I have tested the modifications with the CFE standalone option "FORCING" and the ./run_cfe.sh FORCING works correctly.

  mkdir build
  cd build
  cmake ../ -DFORCING=ON
  make
  cd ..
  ./run_cfe.sh FORCING

@WanruWu-NOAA WanruWu-NOAA changed the title Adding the aorc_bmi to cfe/extern/forcing_code and deleting correspon… Adding the aorc_bmi to cfe/extern/aorc_bmi and deleting correspon… Apr 20, 2023
@WanruWu-NOAA
Copy link
Contributor Author

WanruWu-NOAA commented Apr 20, 2023

@ajkhattak Thanks Ahmad for merging the two branches/PRs and helping with the tests on my machine. The results look good for both ./run_cfe.sh FORCING and ./run_cfe.sh FORCINGPET.

Copy link
Contributor

@ajkhattak ajkhattak left a comment

Choose a reason for hiding this comment

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

This is all set. Note: I have cherry-picked your changes from the wwu-dev2 PR, so don't need to merge that.

@WanruWu-NOAA WanruWu-NOAA merged commit 75933fe into master Apr 20, 2023
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