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

Adapt to name changes in ufo #867

Merged
merged 4 commits into from
Apr 25, 2023
Merged

Adapt to name changes in ufo #867

merged 4 commits into from
Apr 25, 2023

Conversation

wsmigaj
Copy link
Contributor

@wsmigaj wsmigaj commented Apr 20, 2023

Description

This PR adapts soca code to some name changes made in https://github.com/JCSDA-internal/ufo/pull/2688, in particular to the renaming of ufo::Locations to ufo::SampledLocations.

(Just in case you're interested: this name change reflects a change in the role of that class. Conceptually, it is now a collection of interpolation paths sampling the observation locations, and the number of these paths may be different from the number of locations. In particular, an observation operator that wants to take the finite footprint of each observation into account may ask for model variables to be interpolated along multiple paths sampling each observation location; the list of these paths would be stored in a SampledLocations object. Not all variables need to be interpolated along the same paths; for instance, those varying slowly might require interpolation along fewer paths than those varying quickly. In that case the observation operator would create multiple SampledLocations objects and pass them to oops together with a mapping assigning one of these objects to each requested model variable.)

Issue(s) addressed

Part of the work on https://github.com/JCSDA-internal/oops/issues/2003.

Testing

CI

Dependencies

To build and test this branch, oops and ufo need to be on the feature/flexible_geovals branch as well.

@wsmigaj wsmigaj marked this pull request as ready for review April 20, 2023 18:08
@wsmigaj wsmigaj requested a review from travissluka April 20, 2023 18:09
@shlyaeva
Copy link
Contributor

oops and ufo PRs were merged, this is ready for merge now.

@travissluka travissluka merged commit 875b167 into develop Apr 25, 2023
@travissluka travissluka deleted the feature/flexible_geovals branch April 25, 2023 20:43
travissluka pushed a commit that referenced this pull request Apr 25, 2023
climbfuji added a commit that referenced this pull request Jul 17, 2023
* Use SABER blocks chaining for training (#852)

* Adapt to name changes in ufo (#867)

* Use VertInterp instead of MarineVertInterp (#874)

* remove linear var change from ensevariance ctest (#881)

* Bugfixes for BUMP (#869)

* A few fixes to the Model to Analysis variable change (#847)

* Remove discontinuities in the balance op  (#885)

* 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 <[email protected]>

* default plots (#888)

Co-authored-by: Travis Sluka <[email protected]>

* add VADER to SOCA (#887)

* add vader to build, but dont use it

* add State::fromFieldSet

* variablechange "uses" vader

* switched to ens. templ. (#894)

* Implementation of EnsMeanAndVariance (#892)

* added the ensmeanandvariance app

* ...

---------

Co-authored-by: Travis Sluka <[email protected]>

* Read the std. dev. instead of the variance (#896)

* skip sqrt, saving optional

* forgot test yaml

* Update test/testinput/varchange_bkgerrsoca_stddev.yml

Co-authored-by: Travis Sluka <[email protected]>

---------

Co-authored-by: Travis Sluka <[email protected]>

* Use the generic oops interpolator (#898)

* 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

* Update version (#899)

* remove ewok repo (#889)

Co-authored-by: Yannick Trémolet <[email protected]>

* Merge B matrix-related applications (#890)

* Merge B matrix-related applications

* Trigger tests

---------

Co-authored-by: Benjamin Menetrier <[email protected]>
Co-authored-by: Travis Sluka <[email protected]>

* update for VADER PR#586 (#902)

* add ModelData

* fix coding norms

* Update CMakeLists.txt

* Fix vertical gradient (#914)

* a fix dvdz

* Updating test references

---------

Co-authored-by: Hyun-Chul.Lee <[email protected]>

* libs in soca

* Commend out dirac.x test and disable ecbuild_install_project as we did for fv3-jedi prevent the following error:

-- Configuring done
CMake Error in soca/src/soca/CMakeLists.txt:
  Target "soca" INTERFACE_LINK_DIRECTORIES property contains path:

    "/Users/heinzell/work/ufs-bundle/20230714/ufs-bundle-use-jedi-develop/soca/src/soca/."

  which is prefixed in the source directory.

-- Generating done
CMake Generate step failed.  Build files cannot be regenerated correctly.

* Apply same bug fix as for fv3-jedi to fix missing linker path for MPI libraries due to ESMF bug

---------

Co-authored-by: Benjamin Menetrier <[email protected]>
Co-authored-by: Wojciech Śmigaj <[email protected]>
Co-authored-by: Travis Sluka <[email protected]>
Co-authored-by: Guillaume Vernieres <[email protected]>
Co-authored-by: Yannick Trémolet <[email protected]>
Co-authored-by: Benjamin Menetrier <[email protected]>
Co-authored-by: Kriti Bhargava <[email protected]>
Co-authored-by: Hyun-Chul.Lee <[email protected]>
Co-authored-by: Dom Heinzeller <[email protected]>
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.

3 participants