Update feature/ufs_dom from develop 2023/12/12#987
Merged
climbfuji merged 58 commits intofeature/ufs_domfrom Dec 18, 2023
Merged
Update feature/ufs_dom from develop 2023/12/12#987climbfuji merged 58 commits intofeature/ufs_domfrom
climbfuji merged 58 commits intofeature/ufs_domfrom
Conversation
* set to min/max instead of 0 * ... * vanilla vert conv * tidy sign * removed jac_mask * tanh filt * updated yamls and test refs * merge develop and update answers after the develop history MESS i created * code tidy/removed vanilla --------- Co-authored-by: Travis Sluka <tsluka@ucar.edu>
Co-authored-by: Travis Sluka <tsluka@ucar.edu>
* add vader to build, but dont use it * add State::fromFieldSet * variablechange "uses" vader
* added the ensmeanandvariance app * ... --------- Co-authored-by: Travis Sluka <tsluka@ucar.edu>
* skip sqrt, saving optional * forgot test yaml * Update test/testinput/varchange_bkgerrsoca_stddev.yml Co-authored-by: Travis Sluka <tsluka@ucar.edu> --------- Co-authored-by: Travis Sluka <tsluka@ucar.edu>
* use oops interpolation * to_fieldset_ad * forgot some halo masks * fix horizfilt * fix some test answers * letkf workaround for missing val bug * work around for getvalues test * change obs input to have 1 guaranteed land point
Co-authored-by: Yannick Trémolet <30638944+ytremolet@users.noreply.github.com>
* Merge B matrix-related applications * Trigger tests --------- Co-authored-by: Benjamin Menetrier <benjamin.menetrier@irit.fr> Co-authored-by: Travis Sluka <tsluka@ucar.edu>
* add ModelData * fix coding norms
* a fix dvdz * Updating test references --------- Co-authored-by: Hyun-Chul.Lee <Hyun-Chul.Lee@noaa.gov>
* Update refs * Finally fixed --------- Co-authored-by: Benjamin Menetrier <benjamin.menetrier@irit.fr>
* add u,v to vertical remapping * added biogeochem var to the vertical remapping * added vert_interp to fld metadata * output log of interpolated fields
* update yamls * remove vars from model
Co-authored-by: Travis Sluka <tsluka@ucar.edu>
* cleanup bundle, add test data repos * add options in cmakelists
* working 4denvar and ens fcst generation * use templates * hyb4denvar * cleanup
…937) * add oasim to bundle * add optional oasim to bundle * add obs * add to travis ci
* empty sabercentralblock * add dx / dy to gridgen * empty fortran class * WIP * starting to diffuse! * landmask now used * use correct metrics when calculating flux * bruteforce normalization * normalization from randomization * cleanup * fix bad grid parameters in halo * close, ad halo exchange not working right * adjoint test passing!!!! * dt stability * file IO WIP * fix bug in parameter read for halos * filename in conf * update setparams to look like other rossby radius configs * move parameters to separate file * length scales from file * update max iterations * coding norms * tests and references * cleanup * fix randomization's random numbers to make more random * fix references
* add support for groups * update references * fix coding norm
* Update with oops::FieldSet3D * trigger CI --------- Co-authored-by: Anna Shlyaeva <shlyaeva@gmail.com>
* update "time window" in yamls * missed 2... oops
* remove function space (without halo) * wip * WIP * mesh build working * remove toFieldsetAD * fix bug when only using 1 PE * fix node removal logic again. all edge cases SHOULD be handled now * working?! * make saving gmsh optional * small cleanup * small cleanup * cleanup * cleanup, again * cleanup, aaagain * update soca2cice ref * disable FPE trap on dirac diffusion test * fix for regional domain
* update yamls * 3dvar_single_ob.yml --------- Co-authored-by: Anna Shlyaeva <annash@ucar.edu>
… feature/ufs_dom_update_from_develop_20231212
Contributor
Author
|
Added develop from this morning (13 dec 2023) |
* Adapt to saber block interface change * rename FieldSet4DEnsemble -> FieldSets --------- Co-authored-by: Travis Sluka <tsluka@ucar.edu>
Collaborator
|
@climbfuji this needs one more merge from develop (we just merged another coordinate series in oops-saber-soca, doesn't affect fv3-jedi). let me know if you'd like me to merge develop into this branch and push here. |
… feature/ufs_dom_update_from_develop_20231212
4 tasks
mark-a-potts
approved these changes
Dec 15, 2023
Contributor
mark-a-potts
left a comment
mark-a-potts
left a comment
There was a problem hiding this comment.
I can confirm it worked for my build. I did have to add "-fPIC" to the CMAKE_FORTRAN_FLAGS in cdeps, cmeps, and cice CMakeLists.txt files of UFS, though.
Contributor
Author
Can you create a PR for this, please? |
travissluka
approved these changes
Dec 18, 2023
Contributor
travissluka
left a comment
travissluka
left a comment
There was a problem hiding this comment.
i didn't run the code, but I did a quick diff against develop and the merge seems reasonable
Contributor
Author
Thanks @travissluka and @mark-a-potts for your reviews. |
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
14 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.
Description
With great help from @fmahebert I was able to update the soca branch feature/ufs_dom from develop and I can now compile the NG-GODAS app and the S2S app with ufs-bundle PR JCSDA/ufs-bundle#47 (just update the soca branch name) on my macOS using apple-clang@13.1.6, openmpi@4.1.6, spack-stack@1.5.1 with fms@2023.01.
@mark-a-potts @travissluka can you please this PR before I merge it into
feature/ufs_dom?