Merge from OWP Master (Maintain Commit Hash)#18
Closed
Conversation
update submodule url to gitlab See merge request NGWPC/nwm-ngen/cfe!1
fix to CFE unit test for mass balance check See merge request NGWPC/nwm-ngen/cfe!2
…e() function in bmi_cfe.c
# Conflicts: # src/bmi_cfe.c
Adding logging mechanism to CFE module See merge request NGWPC/nwm-ngen/cfe!3
This reverts merge request !3
Revert "Merge branch 'NGWPC-3889' into 'development'" See merge request NGWPC/nwm-ngen/cfe!4
recommit of logger changes for CFE module See merge request NGWPC/nwm-ngen/cfe!5
NGWPC-4428 - CFE logging changes See merge request NGWPC/nwm-ngen/cfe!6
rc-master: Release 1.0.0 Merge See merge request NGWPC/nwm-ngen/cfe!7
Logger optimization See merge request NGWPC/nwm-ngen/cfe!8
Added release number, date and commit hash of official release See merge request NGWPC/nwm-ngen/cfe!9
Adding feature for dynamically setting log level systemwide See merge request NGWPC/nwm-ngen/cfe!10
Logger optimization See merge request NGWPC/nwm-ngen/cfe!11
This reverts commit a7e8451.
This reverts commit 2945134.
Revert "changed the way logLevel char pointer is checked for NULL" See merge request NGWPC/nwm-ngen/cfe!12
Development Branch Merge to release-candidate branch for Release rc-1.1.0 See merge request NGWPC/nwm-ngen/cfe!13
Change malloc to calloc to ensure null pointers
Fix log level from SEVERE to WARNING for a warning
fix flux larger than storage error
Merge release-candidate into development for release 3.1.1.3.0-rc2
Merge development into release-candidate for release 3.1.1.4.0-rc1
Changed warning msg per OWP request
…ure_profile as "1" so UDUNITS2 can parse them
Merge updated warning per OWP to the development branch
Express dimensionless units of ice_fraction_xinanjiang and soil_moisture_profile as "1" so UDUNITS2 can parse them (NGWPC-7604)
Adapt serialization to revised protocol
Get_value Support for "serialization_size" and "reset_time" message
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR merges the changes from OWP's master branch into development in a way that maintains OWP's head hash in the history of this repo. The resulting code is identical to the current development branch of this repo.