From 743993efb0af85c5405ee5563bc65b8f0bb1067e Mon Sep 17 00:00:00 2001 From: Travis Sluka Date: Mon, 31 Jul 2023 16:04:53 -0600 Subject: [PATCH 1/4] add oasim to bundle --- bundle/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/bundle/.gitignore b/bundle/.gitignore index 0e1f2f99f..79798c4ad 100644 --- a/bundle/.gitignore +++ b/bundle/.gitignore @@ -7,6 +7,7 @@ ioda-data/ ioda/ jedicmake/ mom6/ +oasim/ oops/ saber-data/ saber/ From a3531f6e3a5591d3bc1c67f6141b209b1b20e6c3 Mon Sep 17 00:00:00 2001 From: Travis Sluka Date: Tue, 1 Aug 2023 13:05:29 -0600 Subject: [PATCH 2/4] add optional oasim to bundle --- bundle/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bundle/CMakeLists.txt b/bundle/CMakeLists.txt index b4140a773..5d598bec3 100644 --- a/bundle/CMakeLists.txt +++ b/bundle/CMakeLists.txt @@ -36,6 +36,11 @@ if ( BUILD_ICEPACK ) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" UPDATE BRANCH feature/ecbuild-new ) endif() +option(BUILD_OASIM "download and build OASIM ocean color forward operator" OFF) +if ( BUILD_OASIM ) + ecbuild_bundle( PROJECT oasim GIT "https://github.com/JCSDA-internal/oasim.git" UPDATE BRANCH develop ) +endif () + #=================================================================================================== # required repositories #=================================================================================================== From 08b01fa98d8dd1d8d8e4bd80ccd17a20b14c03a2 Mon Sep 17 00:00:00 2001 From: Travis Sluka Date: Tue, 1 Aug 2023 14:32:00 -0600 Subject: [PATCH 3/4] add obs --- test/Data/obs/pace_radiance.nc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 test/Data/obs/pace_radiance.nc diff --git a/test/Data/obs/pace_radiance.nc b/test/Data/obs/pace_radiance.nc new file mode 100644 index 000000000..1e130af09 --- /dev/null +++ b/test/Data/obs/pace_radiance.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b881f3e7f3f5c824de932a149db4f77e7e91dd114a8c5b0aab716cae7e91f8d0 +size 150457 From 7df5d5d53ceff31b010b00b8ac61c0d954b4df7b Mon Sep 17 00:00:00 2001 From: Travis Sluka Date: Tue, 1 Aug 2023 14:32:06 -0600 Subject: [PATCH 4/4] add to travis ci --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f83328a8c..b10df1819 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,15 +20,15 @@ env: global: - MAIN_REPO=soca - - LIB_REPOS="gsw mom6 icepack oops vader ioda ufo saber" - - BUILD_OPT="-DBUILD_ICEPACK=ON" + - LIB_REPOS="gsw mom6 icepack oasim oops vader ioda ufo saber" + - BUILD_OPT="-DBUILD_ICEPACK=ON -DBUILD_OASIM=ON" - BUILD_OPT_mom6="-DENABLE_OCEAN_BGC=ON" - BUILD_OPT_oops="-DENABLE_QG_MODEL=OFF -DENABLE_LORENZ95_MODEL=OFF" - BUILD_OPT_ioda="-DBUILD_PYTHON_BINDINGS=OFF -DBUILD_TESTING=OFF" - BUILD_OPT_ufo="-DLOCAL_PATH_TESTFILES_IODA=NONE" - BUILD_OPT_saber="-DENABLE_TESTS=OFF" - BUILD_OPT_soca="-DENABLE_OCEAN_BGC=ON" - - MATCH_REPOS="saber oops ioda ufo mom6 soca" + - MATCH_REPOS="saber oops ioda ufo mom6 soca oasim" - LFS_REPOS="" # ENABLE_VALGRIND="ON"