Conversation
Added Apache license and copyright information for cfe repo via modification of existing LICENSE file
* Update cfe.c Fixed major bug in xinanjiang function. One minor bass balance fix. Refactored. Verified code against NWM Fortran Xinanjiang function. Changed "infiltation_excess_params_struct" to "infiltration_excess_params_structure". Added "#ifdef DEBUG #endif around mass balance warning print statement at end of xinanjiang scheme function. * fix: adjust white space for better review, fix struct parameter --------- Co-authored-by: hellkite500 <nfrazier@lynker.com>
…ulation Co-authored-by: Nels <nels.frazier@noaa.gov>
* chore: small formatting refactor Co-authored-by: ajkhattak <ajkhattak@gmail.com> * feat: add method to compute et_from_retention_depth Co-authored-by: ajkhattak <ajkhattak@gmail.com> * fix: take AET from surface retention depth Co-authored-by: ajkhattak <ajkhattak@gmail.com> * fix: try to prevent segfault when computing AET from retention depth --------- Co-authored-by: ajkhattak <ajkhattak@gmail.com>
hellkite500
left a comment
hellkite500
left a comment
There was a problem hiding this comment.
Since this did have to resolve conflicts, can you comment on the previous commits which were modified? There were several key bug fixes that looked like they were properly captured, and I'm guessing its just the first commit here that had to be resolved and changed the subsequent commits? Can you let me know about where the conflicts occured?
| #ifdef DEBUG | ||
| if(fabs(water_input_depth_m - (*infiltration_depth_m) - (*infiltration_excess_m)) > 1.0e-06) printf("Massball err. warning: %f\n", | ||
|
|
||
| if(fabs(water_input_depth_m - (*infiltration_depth_m) - (*infiltration_excess_m)) > 1.0e-06) Log(DEBUG, "Massball err. warning: %f\n", |
There was a problem hiding this comment.
I'm not convinced that this shouldn't still be wrapped in the conditional pre-processor, but since it is a small extra computation that probably isn't going to impact overall performance right now, we can probably leave it.
|
|
||
| set_target_properties(cfebmi PROPERTIES PUBLIC_HEADER ./include/bmi_cfe.h) | ||
|
|
||
| target_link_libraries(cfebmi PRIVATE Boost::serialization) |
There was a problem hiding this comment.
If we are not bringing over the serialization right now, then this doesn't belong in this PR.
| printf(" Runon infiltration = %8.4lf m\n",cfe_ptr->vol_struct.vol_runon_infilt); | ||
| printf(" Vol_et_from_retention_depth = %8.4lf m\n",cfe_ptr->vol_struct.vol_et_from_retention_depth); | ||
| printf(" Surface residual = %6.4e m\n", giuh_residual); // should equal zero | ||
| Log(INFO, "********************* SURFACE MASS BALANCE *********************\n"); |
There was a problem hiding this comment.
It looks like this PR didn't capture all the logging, particularly the logger.h and its inclusion to make sure this code here "works".
5 participants
[Short description explaining the high-level reason for the pull request]
Additions
Removals
Changes
Testing
Screenshots
Notes
Todos
Checklist
Testing checklist
Target Environment support
Accessibility
Other