Merge GEOSadas-5.29.4-p4 into main #225
Merged
Conversation
This file contains 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
…ate_ARCHIVE_to_Pyradmon Logic was added to pass the ARCHIVE location from GEOSadas to the Pyr…
… case for x46 correction
… nc4 files directly! - he is working to fix that - until then the bin files are neded
…-adasfix Update LICENSE to Apache, other license changes
Merging Feature/saraqzhang/ladasdev w/ latest branch of DAS - before going to develop
…3_4LDAS These are mild modifications of the work of Sara and Rolf for LDAS.
…3_parallelTAR now using parallel tar to get ensemble
constructed from Sara's recent commit 5fac454 5fac454?w=1
Feature/karpob/omplp g rename
Orbit params and others
add geosit_prep_bufr
version numbers now to all repos
minor fixes for GEOSIT - one fix for FP (EnKF)
diff entries for eps
…_code vb:update ana_aod.F code to handle both AOD and LAOD obs at the same …
minor fixes for GEOSIT
a set of minor changes/fixes for GEOS-IT
tclune
reviewed
Oct 13, 2022
Comment on lines
+40
to
+48
| message("Setting fvID to fvsetup SHA1 (1st 10 digits)") | ||
| execute_process( | ||
| COMMAND ${GIT_EXECUTABLE} hash-object src/Applications/GEOSdas_App/fvsetup | ||
| COMMAND cut -c1-10 | ||
| WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} | ||
| OUTPUT_VARIABLE fvID | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE | ||
| ) | ||
| message("fvID=${fvID}") |
There was a problem hiding this comment.
I am concerned about this block of code. We generally don't want to touch the source directory, and in a mepo context this is particularly problematic as it would be at the level of the fixture. Slightly preferable would be ${CMAKE_CURRENT_SOURCE_DIR}, but really something in the binary tree would be preferred.
Perhaps someone could explain to me why execution in the source directory is desired/essential?
tclune
reviewed
Oct 13, 2022
rtodling
approved these changes
Oct 17, 2022
@rtodling It has been merged in. You can now make a release for v5.29.4.4 (or I can do so and you can fill out the release notes). Let me know. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 is a merge of the tag
GEOSadas-5.29.4-p4(which is ondevelop) intomain.This is in anticipation of making a
v5.29.4.4tag off ofmain.Note, I'm labeling this as non-0-diff as I'm sure it's quite a bit different to v5.29.0.1! Though @rtodling will know for sure.
As a check, here is a two-dot diff of
GEOSadas-5.29.4-p4and this branch,merge/mathomp4/merge-GEOSadas-5.29.4-p4-into-main, showing all files are identicalhttps://github.com/GEOS-ESM/GEOSadas/compare/GEOSadas-5.29.4-p4..merge/mathomp4/merge-GEOSadas-5.29.4-p4-into-main