From c2f56598f27c37dc4b49b22618e0c9333f1fc85d Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Mon, 24 Apr 2023 06:45:36 +0000 Subject: [PATCH 01/94] Update to new stable build on 20230424 --- CMakeLists.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd40782d4..2cb189278 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,30 +71,30 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" BRANCH develop ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" BRANCH develop ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" BRANCH develop ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" BRANCH develop ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" BRANCH feature/gdasapp_ufo ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG e2b9dc6 ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG de52190 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 4c79b8c ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG f27bd1c ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1a67b67 ) # FMS and FV3 dynamical core - ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" BRANCH release-stable ) - ecbuild_bundle( PROJECT fv3 GIT "https://github.com/jcsda/GFDL_atmos_cubed_sphere.git" BRANCH release-stable ) + ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) + ecbuild_bundle( PROJECT fv3 GIT "https://github.com/jcsda/GFDL_atmos_cubed_sphere.git" TAG 61450b4 ) # fv3-jedi and associated repositories - ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" BRANCH develop ) - ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" BRANCH develop ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" BRANCH develop ) + ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) + ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 07b1a28 ) # SOCA associated repositories - ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" BRANCH develop ) - ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" BRANCH main-ecbuild RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH develop ) + ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) + ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 5d1a7ad ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" BRANCH develop ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG c27c1df ) endif() # Land associated repositories From 5f5f39d500ac8172af87e0b1a46e07d28901b072 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 28 Apr 2023 18:30:27 +0000 Subject: [PATCH 02/94] Update to new stable build on 20230428 --- CMakeLists.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 89bc720d3..0517c0cfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,24 +67,24 @@ if(BUILD_GDASBUNDLE) # Build GSI-B option(BUILD_GSIBEC "Build GSI-B" OFF) if(BUILD_GSIBEC) - ecbuild_bundle( PROJECT gsibec GIT "https://github.com/GEOS-ESM/GSIbec.git" TAG 1.0.7 ) + ecbuild_bundle( PROJECT gsibec GIT "https://github.com/GEOS-ESM/GSIbec.git" TAG 271edbc ) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" BRANCH develop ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" BRANCH develop ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" BRANCH develop ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" BRANCH develop ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" BRANCH feature/gdasapp_ufo ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG faffa88 ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG efa93b0 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 0afdd86 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core - ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" BRANCH release-stable ) - ecbuild_bundle( PROJECT fv3 GIT "https://github.com/jcsda/GFDL_atmos_cubed_sphere.git" BRANCH release-stable ) + ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) + ecbuild_bundle( PROJECT fv3 GIT "https://github.com/jcsda/GFDL_atmos_cubed_sphere.git" TAG 61450b4 ) # fv3-jedi and associated repositories - ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" BRANCH develop ) - ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" BRANCH develop ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" BRANCH develop ) + ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) + ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG dc58205 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -92,14 +92,14 @@ if(BUILD_GDASBUNDLE) if ( BUILD_ICEPACK ) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() - ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" BRANCH develop ) - ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" BRANCH main-ecbuild RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH develop ) + ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) + ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 75dec0a ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" BRANCH develop ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 6a3c59b ) endif() # Land associated repositories From a36ac335f171d9e295e9b222b028974a16fbd0fa Mon Sep 17 00:00:00 2001 From: Cory Martin Date: Fri, 28 Apr 2023 19:49:56 +0000 Subject: [PATCH 03/94] Update CMakeLists.txt --- CMakeLists.txt | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9654ecf6..0517c0cfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,19 +71,11 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories -<<<<<<< HEAD ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG faffa88 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG efa93b0 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 0afdd86 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) -======= - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG faffa88 ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG efa93b0 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 0afdd86 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) ->>>>>>> develop # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -92,14 +84,6 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) -<<<<<<< HEAD - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG dc58205 ) - -# SOCA associated repositories - ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) - ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 75dec0a ) -======= ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG dc58205 ) # SOCA associated repositories @@ -111,16 +95,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 75dec0a ) ->>>>>>> develop # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) -<<<<<<< HEAD - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 6a3c59b ) -======= ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 6a3c59b ) ->>>>>>> develop endif() # Land associated repositories From fee9a6fe7ac079013578ba46c41f8016dc2c9deb Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 28 Apr 2023 20:37:24 +0000 Subject: [PATCH 04/94] Update to new stable build on 20230428 --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0517c0cfe..bccdda22b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,9 +71,15 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories +<<<<<<< Updated upstream ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG faffa88 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG efa93b0 ) +======= + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) +>>>>>>> Stashed changes ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 0afdd86 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) From 0058ca3223a0c665538d93c10e64c0339584ff8d Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 29 Apr 2023 06:49:58 +0000 Subject: [PATCH 05/94] Update to new stable build on 20230429 --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index bccdda22b..69ccaed57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,10 +71,16 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories +<<<<<<< Updated upstream <<<<<<< Updated upstream ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG faffa88 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG efa93b0 ) +======= + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) +>>>>>>> Stashed changes ======= ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) From dd9f8387ebc693f7c1c17f1d80863e72ed1c29a8 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sun, 30 Apr 2023 06:45:52 +0000 Subject: [PATCH 06/94] Update to new stable build on 20230430 --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69ccaed57..24bb15899 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,7 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories <<<<<<< Updated upstream +<<<<<<< Updated upstream <<<<<<< Updated upstream ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG faffa88 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) @@ -81,6 +82,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) >>>>>>> Stashed changes +======= + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) +>>>>>>> Stashed changes ======= ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) From 766b4d07ab3773fee386165c991714ea0c50d19a Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Mon, 1 May 2023 06:44:21 +0000 Subject: [PATCH 07/94] Update to new stable build on 20230501 --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24bb15899..35331c44b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,7 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories <<<<<<< Updated upstream <<<<<<< Updated upstream +<<<<<<< Updated upstream <<<<<<< Updated upstream ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG faffa88 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) @@ -87,6 +88,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) >>>>>>> Stashed changes +======= + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) +>>>>>>> Stashed changes ======= ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) From da646d2dd8081c0ceebe4cf2bd8e67c57db3ce8e Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Mon, 1 May 2023 13:14:24 +0000 Subject: [PATCH 08/94] Update to new stable build on 20230501 --- CMakeLists.txt | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35331c44b..aade42b85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,37 +67,13 @@ if(BUILD_GDASBUNDLE) # Build GSI-B option(BUILD_GSIBEC "Build GSI-B" OFF) if(BUILD_GSIBEC) - ecbuild_bundle( PROJECT gsibec GIT "https://github.com/GEOS-ESM/GSIbec.git" TAG 271edbc ) + ecbuild_bundle( PROJECT gsibec GIT "https://github.com/GEOS-ESM/GSIbec.git" TAG 1.1.2 ) endif() # Core JEDI repositories -<<<<<<< Updated upstream -<<<<<<< Updated upstream -<<<<<<< Updated upstream -<<<<<<< Updated upstream - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG faffa88 ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG efa93b0 ) -======= - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) ->>>>>>> Stashed changes -======= - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) ->>>>>>> Stashed changes -======= - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) ->>>>>>> Stashed changes -======= ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) ->>>>>>> Stashed changes ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 0afdd86 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) From 50740f1088dc2a3fc30ddaf8c4751f225117d887 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 2 May 2023 06:45:20 +0000 Subject: [PATCH 09/94] Update to new stable build on 20230502 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aade42b85..21f89d5ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 0afdd86 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 46c5644 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG dc58205 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG d899827 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 6a3c59b ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 84c442d ) endif() # Land associated repositories From f592e465a61e29d62531a8ca4c909b6a35c9887e Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 3 May 2023 06:47:46 +0000 Subject: [PATCH 10/94] Update to new stable build on 20230503 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21f89d5ac..0df697ec5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,9 +72,9 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG a3c0600 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 44f9e27 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 46c5644 ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 6278053 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG a8852a1 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 5d37f63 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG d899827 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG c093d91 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github From e98bf881b94aa8148c9027daac17a400abd42bf9 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 4 May 2023 06:49:15 +0000 Subject: [PATCH 11/94] Update to new stable build on 20230504 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0df697ec5..77f952d93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 6278053 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG a8852a1 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 5d37f63 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 6b7628d ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG c093d91 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG a6d8c85 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -94,7 +94,7 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 75dec0a ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 6f6e0f4 ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) From 71ffa84460cd44af08f6c01a96ac482b1a1f7c94 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 9 May 2023 06:49:47 +0000 Subject: [PATCH 12/94] Update to new stable build on 20230509 --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77f952d93..dcd652991 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,10 +71,10 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0925baf ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 6278053 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG a8852a1 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 6b7628d ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG a4aa20c ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 624f417 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fc18d4d ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG a6d8c85 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG c9e896a ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -94,12 +94,12 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 6f6e0f4 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 8fd638d ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 84c442d ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG ac8b1aa ) endif() # Land associated repositories From 4ac96b93b93bf91a846ad4047ba18581ebb760f5 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 10 May 2023 06:48:48 +0000 Subject: [PATCH 13/94] Update to new stable build on 20230510 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dcd652991..994f4b573 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,8 +73,8 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG a4aa20c ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 624f417 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fc18d4d ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 4397f9e ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 935172b ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG c9e896a ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 21a2686 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG ac8b1aa ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG c0a079c ) endif() # Land associated repositories From e77c5568bffb31067a2e295d316cbd55df1c52dd Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 11 May 2023 06:45:04 +0000 Subject: [PATCH 14/94] Update to new stable build on 20230511 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 994f4b573..c08bf2c92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,10 +71,10 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG a4aa20c ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG f952fb7 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 4397f9e ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 935172b ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG c726c48 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 52685f5 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG c0a079c ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 16fb63a ) endif() # Land associated repositories From ab6f06d4e7243b6b9f476d16c9d5f9489551e1f9 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 12 May 2023 06:48:13 +0000 Subject: [PATCH 15/94] Update to new stable build on 20230512 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c08bf2c92..45c9b0c1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG f952fb7 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG c726c48 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 70952bb ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 52685f5 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 16fb63a ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG c277ccc ) endif() # Land associated repositories From 81675c9c9c11cd3a309c3981ce3ef0b10ad6c08b Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 16 May 2023 06:52:50 +0000 Subject: [PATCH 16/94] Update to new stable build on 20230516 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45c9b0c1b..6490dbb6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG f952fb7 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 70952bb ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 52685f5 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fa59003 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 21a2686 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 098fd3a ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -94,12 +94,12 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 8fd638d ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG bdfad33 ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG c277ccc ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 2b9993a ) endif() # Land associated repositories From 27cf69db2b197757268c1ff7aaeb4caf7f2a438c Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 17 May 2023 06:49:59 +0000 Subject: [PATCH 17/94] Update to new stable build on 20230517 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6490dbb6b..7928b4dc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG f952fb7 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 70952bb ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 16bffb9 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fa59003 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) From 1696cda07b8e166c005b99247dbdb4c90e304ca3 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 18 May 2023 06:49:06 +0000 Subject: [PATCH 18/94] Update to new stable build on 20230518 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7928b4dc3..af8dceeaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG f952fb7 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 16bffb9 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fa59003 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fde9cc6 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core From 551d4c7bfcc187cf784c2262a2f574ee91260fd0 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 19 May 2023 06:50:51 +0000 Subject: [PATCH 19/94] Update to new stable build on 20230519 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af8dceeaa..a8936c899 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG f952fb7 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 16bffb9 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fde9cc6 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 7dc95e9 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core From 328cc4a09cf7e2b4d4ce7fedd5ba5e5b953158fb Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 20 May 2023 06:47:40 +0000 Subject: [PATCH 20/94] Update to new stable build on 20230520 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8936c899..fdca2e573 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG f952fb7 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 16bffb9 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 7dc95e9 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 81cdb7c ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -94,7 +94,7 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG bdfad33 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 2d7be80 ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) From f38549ecb829c6926e12cf56cf942a4684ecc4ab Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 23 May 2023 06:50:42 +0000 Subject: [PATCH 21/94] Update to new stable build on 20230523 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fdca2e573..76157462d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 098fd3a ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG c5d8c65 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 2b9993a ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 426817a ) endif() # Land associated repositories From 8bf4bdd5787105c610598e4ff7b0e0a70b60902d Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 24 May 2023 06:49:58 +0000 Subject: [PATCH 22/94] Update to new stable build on 20230524 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 76157462d..292b6b04a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG c5d8c65 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG ef02755 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 426817a ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 08d8e1c ) endif() # Land associated repositories From afb3a932164e518b795f02517ee07904b9f9caeb Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 26 May 2023 06:48:32 +0000 Subject: [PATCH 23/94] Update to new stable build on 20230526 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 292b6b04a..f06addc9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG f952fb7 ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG d91a349 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 16bffb9 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 81cdb7c ) @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG ef02755 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG f42b6c4 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -94,7 +94,7 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 2d7be80 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 3bfb201 ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) From 2df6e96defb1a97758b23e6788a1a71020956cfb Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 27 May 2023 06:49:30 +0000 Subject: [PATCH 24/94] Update to new stable build on 20230527 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f06addc9f..ee79fa0f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG f42b6c4 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 17f70db ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 08d8e1c ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 23d0908 ) endif() # Land associated repositories From 6282fdf895a327b375ff718dfb33a2dd575a20d6 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 31 May 2023 06:48:36 +0000 Subject: [PATCH 25/94] Update to new stable build on 20230531 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee79fa0f0..c09efb2ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG d91a349 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 16bffb9 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 81cdb7c ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 063e978 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -94,7 +94,7 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 3bfb201 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 7f4cc74 ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) From d17158854326d2910b7f1331f9a07c9cc36d564e Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 1 Jun 2023 06:49:15 +0000 Subject: [PATCH 26/94] Update to new stable build on 20230601 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c09efb2ce..f7839f857 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG d91a349 ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 6287c4d ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 16bffb9 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 063e978 ) From 87e071f5acaf3209d46fc7313c6b003fe54554cf Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 2 Jun 2023 06:53:05 +0000 Subject: [PATCH 27/94] Update to new stable build on 20230602 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7839f857..92021b249 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 6287c4d ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 16bffb9 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 6f6576e ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 063e978 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) From 7a2f299ebd75b2ce1b7456509b80c62df588a626 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 3 Jun 2023 06:45:43 +0000 Subject: [PATCH 28/94] Update to new stable build on 20230603 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92021b249..97db3225d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,9 +71,9 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 6287c4d ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 80252e3 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 6f6576e ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG a23c717 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 063e978 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 23d0908 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG a791ec0 ) endif() # Land associated repositories From c9cd07f6d6f82ca329330c545f253a47cb84df90 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 6 Jun 2023 06:46:12 +0000 Subject: [PATCH 29/94] Update to new stable build on 20230606 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f070ed044..56fccad4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 80252e3 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG a23c717 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 063e978 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fcb3fb7 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core From 1da2e6350609149cec8f21be4585e88494daf9ce Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 9 Jun 2023 13:27:01 +0000 Subject: [PATCH 30/94] Update to new stable build on 20230609 --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56fccad4d..0678cda57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,10 +71,10 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 80252e3 ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 5fca331 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG a23c717 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fcb3fb7 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1c35ddd ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 6205dc4 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 17f70db ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 339b66c ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG a791ec0 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 021891f ) endif() # Land associated repositories From e7fa85b13d9e0bb1e6a6aff349a5ff6ab1db7640 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 10 Jun 2023 06:47:53 +0000 Subject: [PATCH 31/94] Update to new stable build on 20230610 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0678cda57..42e5736ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 5fca331 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1c35ddd ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 6205dc4 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 26e8a8e ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) # FMS and FV3 dynamical core @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 339b66c ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 84aa01f ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github From 8f223daad642f83bfd55bd70906dd7a5aa93cbb2 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 13 Jun 2023 06:50:55 +0000 Subject: [PATCH 32/94] Update to new stable build on 20230613 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42e5736ac..94ce5629c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 5fca331 ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1d41d55 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1c35ddd ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 26e8a8e ) @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 84aa01f ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 606fe5f ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -94,7 +94,7 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 7f4cc74 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 5cc3b00 ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) From 333337b1af51b882889927a54fb0738096691062 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 7 Jul 2023 07:28:14 +0000 Subject: [PATCH 33/94] Update to new stable build on 20230707 --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94ce5629c..dc136cd47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,11 +71,11 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1d41d55 ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 166090d ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1c35ddd ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 26e8a8e ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 33b3ded ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0cbec65 ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 68ebc46 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG c1c5513 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 1764078 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 2f7ef22 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 606fe5f ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG dece036 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -94,12 +94,12 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 5cc3b00 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 0d6d195 ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 021891f ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 146cd47 ) endif() # Land associated repositories From e61e33c7c072f6749e7a223e027afecc106b4506 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 8 Jul 2023 07:22:57 +0000 Subject: [PATCH 34/94] Update to new stable build on 20230708 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc136cd47..0259ea6bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0cbec65 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 68ebc46 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG c1c5513 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 1764078 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG d69fec6 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 2f7ef22 ) # FMS and FV3 dynamical core @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG dece036 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 9445685 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 146cd47 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 14d9e06 ) endif() # Land associated repositories From 4452b0afb088c240e34fa73af756a91cfe045491 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 14 Jul 2023 07:22:55 +0000 Subject: [PATCH 35/94] Update to new stable build on 20230714 --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0259ea6bf..e6f4024ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,9 +73,9 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0cbec65 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 68ebc46 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG c1c5513 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG d69fec6 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 2f7ef22 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 45c261b ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 3dc4477 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e4144cb ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 9445685 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 6246644 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -94,12 +94,12 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 0d6d195 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 7efe282 ) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 14d9e06 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG f8d4dee ) endif() # Land associated repositories From fed5c4d21fe63e0de6b396ca7b5f12e3022d5efd Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 15 Jul 2023 07:29:43 +0000 Subject: [PATCH 36/94] Update to new stable build on 20230715 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6f4024ef..059b92e8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,10 +71,10 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0cbec65 ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG baafbd6 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 68ebc46 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 45c261b ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 3dc4477 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 87c48dd ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG eb6933c ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e4144cb ) # FMS and FV3 dynamical core From b3f800e9fc417a8ae0e8fe3b8373b4353c43ea15 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Mon, 17 Jul 2023 07:30:32 +0000 Subject: [PATCH 37/94] Update to new stable build on 20230717 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 059b92e8f..d8545e49b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG baafbd6 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 68ebc46 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 87c48dd ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 78c8fc4 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG eb6933c ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e4144cb ) From fd8aa2fa165faf66dc0a2883ce65b27430c46130 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 18 Jul 2023 07:34:25 +0000 Subject: [PATCH 38/94] Update to new stable build on 20230718 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bbe8e218..e75832d61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,10 +71,10 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG baafbd6 ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 53d18c6 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 68ebc46 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 78c8fc4 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG eb6933c ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 308cdf2 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 7006421 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e4144cb ) # FMS and FV3 dynamical core @@ -102,7 +102,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG f8d4dee ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 1e46f82 ) endif() # Land associated repositories From a8e878a68fcd636caaf6e0555d19f49862659d6d Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 20 Jul 2023 08:00:06 +0000 Subject: [PATCH 39/94] Update to new stable build on 20230720 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e75832d61..dbac34416 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,10 +71,10 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 53d18c6 ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 6da870c ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 68ebc46 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 308cdf2 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 7006421 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG b700b28 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 135bdf0 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e4144cb ) # FMS and FV3 dynamical core @@ -102,7 +102,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 1e46f82 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG bc23747 ) endif() # Land associated repositories From b7c8a4b20df840a0a367ef4da7744168bd34ad29 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 21 Jul 2023 07:47:45 +0000 Subject: [PATCH 40/94] Update to new stable build on 20230721 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dbac34416..5ea904e86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 6da870c ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0ef5ff2 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 68ebc46 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG b700b28 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 135bdf0 ) @@ -84,7 +84,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 6246644 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG ff733c4 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -94,7 +94,7 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 7efe282 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 33274de ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) @@ -102,7 +102,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG bc23747 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 83d268d ) endif() # Land associated repositories From 40621caddf9313059e806c9c4e87937fdefb4c6e Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 22 Jul 2023 07:51:07 +0000 Subject: [PATCH 41/94] Update to new stable build on 20230722 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ea904e86..0243a4cc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0ef5ff2 ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG e788663 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 68ebc46 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG b700b28 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 135bdf0 ) @@ -102,7 +102,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 83d268d ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 58cb1d8 ) endif() # Land associated repositories From 846c9cece39b06a16a23a5a2eb61e69048f98a8f Mon Sep 17 00:00:00 2001 From: Jiarui Dong Date: Mon, 24 Jul 2023 11:21:12 -0400 Subject: [PATCH 42/94] Prepare GTS snow depth observations for JEDI-based Land DA (#541) * Initiate to process the gts bufr data into the ioda format. * Change the io paths for matching the global-workflow. * Modify the ctest for the bufr2ioda yaml files. --- parm/land/prep/prep_gts.yaml | 9 +++ test/land/CMakeLists.txt | 2 +- test/testinput/bufr_adpsfc_snow.yaml | 4 +- ush/land/bufr_adpsfc_snow.yaml | 85 ++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 parm/land/prep/prep_gts.yaml create mode 100644 ush/land/bufr_adpsfc_snow.yaml diff --git a/parm/land/prep/prep_gts.yaml b/parm/land/prep/prep_gts.yaml new file mode 100644 index 000000000..7fc552aef --- /dev/null +++ b/parm/land/prep/prep_gts.yaml @@ -0,0 +1,9 @@ +gtsbufr: + mkdir: + - $(DATA)/obs + copy: + - [$(COM_OBS)/$(OPREFIX)adpsfc.tm00.bufr_d, $(DATA)/obs/] +gtsioda: + copy: + - [$(DATA)/$(OPREFIX)adpsfc_snow.nc4, $(COM_OBS)/$(OPREFIX)adpsfc_snow.nc4] + diff --git a/test/land/CMakeLists.txt b/test/land/CMakeLists.txt index 813b80fcd..edaff5a9f 100644 --- a/test/land/CMakeLists.txt +++ b/test/land/CMakeLists.txt @@ -32,6 +32,6 @@ set_tests_properties(test_gdasapp_land_letkfoi_snowda # Test convert BUFR to IODA add_test(NAME test_gdasapp_convert_bufr_adpsfc_snow - COMMAND ${PROJECT_SOURCE_DIR}/test/soca/test_bufr2ioda.sh ${PROJECT_BINARY_DIR} bufr_adpsfc_snow + COMMAND ${PROJECT_SOURCE_DIR}/test/land/test_bufr2ioda.sh ${PROJECT_BINARY_DIR} bufr_adpsfc_snow WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/) diff --git a/test/testinput/bufr_adpsfc_snow.yaml b/test/testinput/bufr_adpsfc_snow.yaml index c7f322a35..acaeb455b 100644 --- a/test/testinput/bufr_adpsfc_snow.yaml +++ b/test/testinput/bufr_adpsfc_snow.yaml @@ -7,7 +7,7 @@ observations: - obs space: name: bufr - obsdatain: "./testdata/gdas.t06z.adpsfc.tm00.bufr_d" + obsdatain: $(DATA)/obs/$(OPREFIX)adpsfc.tm00.bufr_d exports: variables: @@ -41,7 +41,7 @@ observations: ioda: backend: netcdf - obsdataout: "./testoutput/gdas.t06z.adpsfc_snow.nc" + obsdataout: $(DATA)/$(OPREFIX)adpsfc_snow.nc4 variables: diff --git a/ush/land/bufr_adpsfc_snow.yaml b/ush/land/bufr_adpsfc_snow.yaml new file mode 100644 index 000000000..c7f322a35 --- /dev/null +++ b/ush/land/bufr_adpsfc_snow.yaml @@ -0,0 +1,85 @@ +# (C) Copyright 2021-2022 NOAA/NWS/NCEP/EMC +# +# This software is licensed under the terms of the Apache Licence Version 2.0 +# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + +observations: + - obs space: + name: bufr + + obsdatain: "./testdata/gdas.t06z.adpsfc.tm00.bufr_d" + + exports: + variables: + # MetaData + timestamp: + datetime: + year: "*/YEAR[1]" + month: "*/MNTH[1]" + day: "*/DAYS[1]" + hour: "*/HOUR[1]" + minute: "*/MINU[1]" + latitude: + query: "[*/CLAT, */CLATH]" + longitude: + query: "[*/CLON, */CLONH]" + stationIdentification: + query: "*/RPID" + + height: + query: "[*/SELV, */HSMSL]" + + # ObsValue + totalSnowDepth: + query: "[*/SNWSQ1/TOSD, */MTRMSC/TOSD, */STGDSNDM/TOSD]" + transforms: + - scale: 1000.0 + filters: + - bounding: + variable: totalSnowDepth + upperBound: 10000000 + + ioda: + backend: netcdf + obsdataout: "./testoutput/gdas.t06z.adpsfc_snow.nc" + + variables: + + # MetaData + - name: "MetaData/dateTime" + coordinates: "longitude latitude" + source: variables/timestamp + longName: "Datetime" + units: "seconds since 1970-01-01T00:00:00Z" + + - name: "MetaData/latitude" + coordinates: "longitude latitude" + source: variables/latitude + longName: "Latitude" + units: "degree_north" + range: [-90, 90] + + - name: "MetaData/longitude" + coordinates: "longitude latitude" + source: variables/longitude + longName: "Longitude" + units: "degree_east" + range: [-180, 180] + + - name: "MetaData/height" + coordinates: "longitude latitude" + source: variables/height + longName: "Height of Station" + + - name: "MetaData/stationIdentification" + coordinates: "longitude latitude" + source: variables/stationIdentification + longName: "Identification of Observing Location" + units: "m" + + # ObsValue + - name: "ObsValue/totalSnowDepth" + coordinates: "longitude latitude" + source: variables/totalSnowDepth + longName: "Total Snow Depth" + units: "mm" From 597b970720e18f98dfa4119c1d8729eda65adf9a Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 25 Jul 2023 08:17:41 -0400 Subject: [PATCH 43/94] Filtering of the offline ensemble members, and more ... (#539) * filter offline ensemble * fixed py norm * point to public oops * update for oops 2258, point ufo to dev * reverted ufo branch and soca obs list * wrong date in yaml --- CMakeLists.txt | 6 +- parm/soca/berror/saber_block_ens.yaml | 12 --- parm/soca/berror/saber_blocks.yaml | 48 ++++++------ parm/soca/berror/soca_apply_steric.yaml | 43 +++++++++++ parm/soca/berror/soca_bump_loc.yaml | 21 ++---- parm/soca/berror/soca_bump_split.yaml | 2 +- parm/soca/berror/soca_clim_ens_moments.yaml | 29 ++++++++ parm/soca/berror/soca_clim_ens_perts.yaml | 35 +++++++++ parm/soca/berror/soca_ensweights.yaml | 27 +++++++ parm/soca/berror/soca_setlocscales.yaml | 26 +++++++ parm/soca/obs/config/salt_profile_fnmoc.yaml | 7 +- parm/soca/obs/config/temp_profile_fnmoc.yaml | 6 +- parm/soca/variational/3dvarfgat.yaml | 28 ++----- parm/soca/variational/socaincr2mom6.yaml | 2 +- scripts/exgdas_global_marine_analysis_bmat.sh | 57 +++++++++++++- scripts/exgdas_global_marine_analysis_post.py | 13 ++-- scripts/exgdas_global_marine_analysis_prep.py | 74 ++++++++++++++++++- test/soca/testinput/socaincr2mom6.yaml | 2 +- 18 files changed, 343 insertions(+), 95 deletions(-) delete mode 100644 parm/soca/berror/saber_block_ens.yaml create mode 100644 parm/soca/berror/soca_apply_steric.yaml create mode 100644 parm/soca/berror/soca_clim_ens_moments.yaml create mode 100644 parm/soca/berror/soca_clim_ens_perts.yaml create mode 100644 parm/soca/berror/soca_ensweights.yaml create mode 100644 parm/soca/berror/soca_setlocscales.yaml diff --git a/CMakeLists.txt b/CMakeLists.txt index 0243a4cc0..d76e56e07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,9 +92,9 @@ if(BUILD_GDASBUNDLE) if ( BUILD_ICEPACK ) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() - ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) - ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 33274de ) + ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" BRANCH develop ) + ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" BRANCH main-ecbuild RECURSIVE ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/change_mask_value ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) diff --git a/parm/soca/berror/saber_block_ens.yaml b/parm/soca/berror/saber_block_ens.yaml deleted file mode 100644 index 9420102b0..000000000 --- a/parm/soca/berror/saber_block_ens.yaml +++ /dev/null @@ -1,12 +0,0 @@ -covariance model: ensemble -members from template: - template: - read_from_file: 1 - date: '{{ATM_WINDOW_BEGIN}}' - basename: ./ens/ - ocn_filename: MOM.res_%mem%.nc - ice_filename: cice.res_%mem%.nc - remap_filename: ./bkg/MOM.res.nc - state variables: [tocn, sonc, ssh, hocn, cicen, hicen] - pattern: '%mem%' - nmembers: 3 \ No newline at end of file diff --git a/parm/soca/berror/saber_blocks.yaml b/parm/soca/berror/saber_blocks.yaml index 3fb4cf412..d039355da 100644 --- a/parm/soca/berror/saber_blocks.yaml +++ b/parm/soca/berror/saber_blocks.yaml @@ -27,21 +27,22 @@ components: - linear variable change name: BkgErrSOCA read_from_file: 3 - basename: ./ - ocn_filename: 'ocn.bkgerr_stddev.incr.{{ATM_WINDOW_BEGIN}}.nc' - ice_filename: 'ice.bkgerr_stddev.incr.{{ATM_WINDOW_BEGIN}}.nc' - remap_filename: ./INPUT/MOM.res.nc - date: '{{ATM_WINDOW_BEGIN}}' + basename: ./static_ens/ + ocn_filename: 'ocn.orig_ens_stddev.incr.{{ATM_WINDOW_BEGIN}}.nc' + ice_filename: 'ice.orig_ens_stddev.incr.{{ATM_WINDOW_BEGIN}}.nc' + #remap_filename: ./INPUT/MOM.res.nc + date: '{{ATM_WINDOW_MIDDLE}}' t_min: 0.1 - t_max: 5.0 - s_min: 0.0 - s_max: 0.0 + t_max: 10.0 + s_min: 0.1 + s_max: 10.0 ssh_min: 0.0 # std ssh=0 => ssh balance applied as ssh_max: 0.0 # strong constraint cicen_min: 0.1 cicen_max: 0.5 hicen_min: 0.0 hicen_max: 0.0 + standard deviation: true - linear variable change name: BalanceSOCA ksshts: @@ -53,34 +54,29 @@ components: members from template: template: read_from_file: 1 - date: '{{ATM_WINDOW_BEGIN}}' + date: '{{ATM_WINDOW_MIDDLE}}' basename: ./static_ens/ - ocn_filename: ocn.%mem%.nc - ice_filename: ice.%mem%.nc - remap_filename: ./INPUT/MOM.res.nc - state variables: [tocn, socn, ssh, uocn, vocn, hocn, cicen, hicen, hsnon, mld, layer_depth] + ocn_filename: 'ocn.filtered.%mem%.incr.{{ATM_WINDOW_BEGIN}}.nc' + ice_filename: 'ice.filtered.%mem%.incr.{{ATM_WINDOW_BEGIN}}.nc' + state variables: [tocn, socn, ssh, uocn, vocn, cicen, hicen, hsnon] pattern: '%mem%' nmembers: ${CLIM_ENS_SIZE} localization: localization method: SABER saber central block: saber block name: BUMP_NICAS - active variables: [tocn, socn, ssh, uocn, vocn, cicen, hicen, hsnon] read: io: data directory: bump - #files prefix: soca_bump drivers: - multivariate strategy: crossed + multivariate strategy: duplicated read local nicas: true - grids: - - model: - variables: [tocn, socn, uocn, vocn] -# io: -# files prefix: bump - - model: - variables: [ssh, cicen, hicen, hsnon] -# io: -# files prefix: bump + model: + do not cross mask boundaries: false + weight: - value: 1.0 + read_from_file: 3 + basename: ./ + ocn_filename: 'ocn.ens_weights.incr.{{ATM_WINDOW_MIDDLE}}.nc' + ice_filename: 'ice.ens_weights.incr.{{ATM_WINDOW_MIDDLE}}.nc' + date: '{{ATM_WINDOW_MIDDLE}}' diff --git a/parm/soca/berror/soca_apply_steric.yaml b/parm/soca/berror/soca_apply_steric.yaml new file mode 100644 index 000000000..62e9ded2b --- /dev/null +++ b/parm/soca/berror/soca_apply_steric.yaml @@ -0,0 +1,43 @@ +input geometry: + geom_grid_file: soca_gridspec.nc + mom6_input_nml: mom_input.nml + fields metadata: fields_metadata.yaml + +output geometry: + geom_grid_file: soca_gridspec.nc + mom6_input_nml: mom_input.nml + fields metadata: fields_metadata.yaml + +linear variable change: + input variables: [tocn, socn, ssh, uocn, vocn, hocn, cicen, hicen, hsnon] + output variables: [tocn, socn, ssh, uocn, vocn, hocn, cicen, hicen, hsnon] + do inverse: false + linear variable changes: + - linear variable change name: BkgErrFILT + ocean_depth_min: 500 # zero where ocean is shallower than 500m + rescale_bkgerr: 0.3 # rescale perturbation + efold_z: 1500.0 # Apply exponential decay + - linear variable change name: BalanceSOCA # linear steric height from (T,S) perturbation + +increments: +- date: '{{ATM_WINDOW_BEGIN}}' + input variables: [tocn, socn, ssh, uocn, vocn, hocn, cicen, hicen, hsnon] + input: + read_from_file: 1 + basename: ./static_ens/ + ocn_filename: 'ocn.bal.ens.MEMNUM.{{ATM_WINDOW_BEGIN}}.PT0S.nc' + ice_filename: 'ice.bal.ens.MEMNUM.{{ATM_WINDOW_BEGIN}}.PT0S.nc' + date: '{{ATM_WINDOW_BEGIN}}' + state variables: [ssh, tocn, socn, uocn, vocn, cicen, hicen, hsnon] + trajectory: + read_from_file: 1 + basename: ./INPUT/ + ocn_filename: MOM.res.nc + ice_filename: cice.res.nc + date: '{{ATM_WINDOW_BEGIN}}' + state variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn, mld, layer_depth] + output: + datadir: ./static_ens + exp: filtered.MEMNUM + type: incr + date: '{{ATM_WINDOW_BEGIN}}' diff --git a/parm/soca/berror/soca_bump_loc.yaml b/parm/soca/berror/soca_bump_loc.yaml index 1d6f35853..0312c5813 100644 --- a/parm/soca/berror/soca_bump_loc.yaml +++ b/parm/soca/berror/soca_bump_loc.yaml @@ -9,7 +9,7 @@ background: basename: ./INPUT/ ocn_filename: MOM.res.nc ice_filename: cice.res.nc - state variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh] + state variables: [tocn] background error: covariance model: SABER @@ -19,7 +19,7 @@ background error: io: data directory: bump drivers: - multivariate strategy: crossed + multivariate strategy: duplicated compute nicas: true write local nicas: true write nicas grids: true @@ -28,11 +28,6 @@ background error: nicas: resolution: !ENV ${NICAS_RESOL} max horizontal grid size: ${NICAS_GRID_SIZE} - grids: - - model: - variables: [socn, tocn, uocn, vocn] - - model: - variables: [ssh, cicen, hicen, hsnon] input model files: - parameter: rh @@ -40,14 +35,14 @@ background error: read_from_file: 1 date: *date basename: ./ - ocn_filename: ocn.cor_rh.incr.0001-01-01T00:00:00Z.nc - ice_filename: ice.cor_rh.incr.0001-01-01T00:00:00Z.nc - state variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh] + ocn_filename: ocn.loc_rh.incr.0001-01-01T00:00:00Z.nc + ice_filename: ice.loc_rh.incr.0001-01-01T00:00:00Z.nc + state variables: [tocn] - parameter: rv file: read_from_file: 1 date: *date basename: ./ - ocn_filename: ocn.cor_rv.incr.0001-01-01T00:00:00Z.nc - ice_filename: ice.cor_rv.incr.0001-01-01T00:00:00Z.nc - state variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh] + ocn_filename: ocn.loc_rv.incr.0001-01-01T00:00:00Z.nc + ice_filename: ice.loc_rv.incr.0001-01-01T00:00:00Z.nc + state variables: [tocn] diff --git a/parm/soca/berror/soca_bump_split.yaml b/parm/soca/berror/soca_bump_split.yaml index cb0822ca1..51bade388 100644 --- a/parm/soca/berror/soca_bump_split.yaml +++ b/parm/soca/berror/soca_bump_split.yaml @@ -9,7 +9,7 @@ background: basename: ./INPUT/ ocn_filename: MOM.res.nc ice_filename: cice.res.nc - state variables: [cicen, hicen, hsnon, socn, tocn, ssh] + state variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh] background error: covariance model: SABER diff --git a/parm/soca/berror/soca_clim_ens_moments.yaml b/parm/soca/berror/soca_clim_ens_moments.yaml new file mode 100644 index 000000000..6304ba0db --- /dev/null +++ b/parm/soca/berror/soca_clim_ens_moments.yaml @@ -0,0 +1,29 @@ +geometry: + geom_grid_file: soca_gridspec.nc + mom6_input_nml: mom_input.nml + fields metadata: fields_metadata.yaml + +ensemble: + members from template: + template: + read_from_file: 1 + date: '{{ATM_WINDOW_BEGIN}}' + basename: ./static_ens/ + ocn_filename: ocn.%mem%.nc + ice_filename: ice.%mem%.nc + remap_filename: ./INPUT/MOM.res.nc + state variables: [tocn, socn, ssh, uocn, vocn, hocn, cicen, hicen, hsnon] + pattern: '%mem%' + nmembers: ${CLIM_ENS_SIZE} + +mean output: + datadir: ./static_ens/ + exp: orig_ens_mean + type: incr + date: '{{ATM_WINDOW_BEGIN}}' + +standard deviation output: + datadir: ./static_ens/ + exp: orig_ens_stddev + type: incr + date: '{{ATM_WINDOW_BEGIN}}' diff --git a/parm/soca/berror/soca_clim_ens_perts.yaml b/parm/soca/berror/soca_clim_ens_perts.yaml new file mode 100644 index 000000000..90d0abb36 --- /dev/null +++ b/parm/soca/berror/soca_clim_ens_perts.yaml @@ -0,0 +1,35 @@ +geometry: + geom_grid_file: soca_gridspec.nc + mom6_input_nml: mom_input.nml + fields metadata: fields_metadata.yaml + +recenter variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn, mld, layer_depth] + +zero center: True + +center: + read_from_file: 1 + basename: ./INPUT/ + ocn_filename: MOM.res.nc + ice_filename: cice.res.nc + date: '{{ATM_WINDOW_BEGIN}}' + state variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn, mld, layer_depth] + +ensemble: + members from template: + template: + read_from_file: 1 + date: '{{ATM_WINDOW_BEGIN}}' + basename: ./static_ens/ + ocn_filename: ocn.%mem%.nc + ice_filename: ice.%mem%.nc + remap_filename: ./INPUT/MOM.res.nc + state variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn, mld, layer_depth] + pattern: '%mem%' + nmembers: ${CLIM_ENS_SIZE} + +recentered output: + datadir: ./static_ens + exp: bal + type: ens + date: '{{ATM_WINDOW_BEGIN}}' diff --git a/parm/soca/berror/soca_ensweights.yaml b/parm/soca/berror/soca_ensweights.yaml new file mode 100644 index 000000000..ee25ab73f --- /dev/null +++ b/parm/soca/berror/soca_ensweights.yaml @@ -0,0 +1,27 @@ +geometry: + mom6_input_nml: mom_input.nml + fields metadata: ./fields_metadata.yaml + +date: '{{ATM_WINDOW_MIDDLE}}' + +variables: + ice: [cicen, hicen, hsnon] + ocean: [tocn, socn, uocn, vocn, ssh] + +background: + date: '{{ATM_WINDOW_BEGIN}}' + basename: ./INPUT/ + ocn_filename: MOM.res.nc + ice_filename: cice.res.nc + read_from_file: 1 + +weights: + # Need to provide weights^2 when reading from file + ice: 0.0025 # 5% of original variance + ocean: 0.01 # 10% " " + +output: + datadir: ./ + date: '{{ATM_WINDOW_MIDDLE}}' + exp: ens_weights + type: incr diff --git a/parm/soca/berror/soca_setlocscales.yaml b/parm/soca/berror/soca_setlocscales.yaml new file mode 100644 index 000000000..981cb4fc5 --- /dev/null +++ b/parm/soca/berror/soca_setlocscales.yaml @@ -0,0 +1,26 @@ +resolution: + mom6_input_nml: mom_input.nml + fields metadata: ./fields_metadata.yaml + +date: 0001-01-01T00:00:00Z + +corr variables: [tocn, cicen] + +scales: + vert layers: 70 # in units of layer + tocn: + rossby mult: 1.00 + min grid mult: 2.0 + cicen: + rossby mult: 1.00 + min grid mult: 2.0 + +rh output: + datadir: ./ + exp: loc_rh + type: incr + +rv output: + datadir: ./ + exp: loc_rv + type: incr diff --git a/parm/soca/obs/config/salt_profile_fnmoc.yaml b/parm/soca/obs/config/salt_profile_fnmoc.yaml index 66689face..bba544fa8 100644 --- a/parm/soca/obs/config/salt_profile_fnmoc.yaml +++ b/parm/soca/obs/config/salt_profile_fnmoc.yaml @@ -9,8 +9,13 @@ obs space: type: H5File obsfile: !ENV ${DATA}/diags/salt_profile_fnmoc.${PDY}${cyc}.nc4 simulated variables: [salinity] + io pool: + max pool size: 1 obs operator: - name: MarineVertInterp + name: VertInterp observation alias file: ./obsop_name_map.yaml + vertical coordinate: sea_water_depth + observation vertical coordinate: depth + interpolation method: linear obs error: covariance model: diagonal diff --git a/parm/soca/obs/config/temp_profile_fnmoc.yaml b/parm/soca/obs/config/temp_profile_fnmoc.yaml index a96cf453b..d7de83182 100644 --- a/parm/soca/obs/config/temp_profile_fnmoc.yaml +++ b/parm/soca/obs/config/temp_profile_fnmoc.yaml @@ -8,8 +8,10 @@ obs space: engine: type: H5File obsfile: !ENV ${DATA}/diags/temp_profile_fnmoc.${PDY}${cyc}.nc4 - simulated variables: [sea_water_temperature] + simulated variables: [waterTemperature] + io pool: + max pool size: 1 obs operator: - name: Identity + name: InsituTemperature obs error: covariance model: diagonal diff --git a/parm/soca/variational/3dvarfgat.yaml b/parm/soca/variational/3dvarfgat.yaml index b429d7dc4..de59a03d8 100644 --- a/parm/soca/variational/3dvarfgat.yaml +++ b/parm/soca/variational/3dvarfgat.yaml @@ -1,16 +1,8 @@ cost function: - cost type: 4D-Var + cost type: 3D-FGAT window begin: '{{ATM_WINDOW_BEGIN}}' window length: $(ATM_WINDOW_LENGTH) analysis variables: &soca_ana_vars [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh] -# variable change: -# variable change name: Ana2Model -# rotate: -# u: [] -# v: [] -# log: -# var: [] -# output variables: *soca_ana_vars geometry: mom6_input_nml: mom_input.nml @@ -19,7 +11,6 @@ cost function: model: name: PseudoModel tstep: PT3H - state variables: &soca_model_vars [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn, mld, layer_depth] states: !INC ${BKG_LIST} background: @@ -28,7 +19,8 @@ cost function: ocn_filename: MOM.res.nc ice_filename: cice.res.nc date: '{{ATM_WINDOW_BEGIN}}' - state variables: *soca_model_vars + state variables: &soca_model_vars [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn, mld, layer_depth] + background error: !INC ${SABER_BLOCKS_YAML} observations: !INC ${OBS_LIST} @@ -40,23 +32,11 @@ variational: - geometry: mom6_input_nml: mom_input.nml fields metadata: ./fields_metadata.yaml - linear model: - name: Identity - increment variables: *soca_ana_vars - variable change: Identity - tstep: PT3H ninner: !ENV ${SOCA_NINNER} gradient norm reduction: 1e-10 test: on diagnostics: departures: ombg - online diagnostics: - write increment: true - increment: - datadir: Data - date: '{{ATM_WINDOW_BEGIN}}' - exp: iter1 - type: incr minimizer: algorithm: RPCG @@ -65,6 +45,8 @@ output: datadir: Data exp: 3dvarfgat_pseudo type: an + frequency: PT3H # can only writes out the analysis at the middle of the window + # when using 3D-FGAT as cost function final: diagnostics: diff --git a/parm/soca/variational/socaincr2mom6.yaml b/parm/soca/variational/socaincr2mom6.yaml index c6c2a50c3..75101244e 100644 --- a/parm/soca/variational/socaincr2mom6.yaml +++ b/parm/soca/variational/socaincr2mom6.yaml @@ -17,7 +17,7 @@ vertical geometry: soca increment: date: '{{ATM_WINDOW_BEGIN}}' basename: ./Data/ - ocn_filename: 'ocn.3dvarfgat_pseudo.incr.{{ATM_WINDOW_BEGIN}}.nc' + ocn_filename: 'ocn.3dvarfgat_pseudo.incr.{{ATM_WINDOW_MIDDLE}}.nc' read_from_file: 1 mom6 iau increment: diff --git a/scripts/exgdas_global_marine_analysis_bmat.sh b/scripts/exgdas_global_marine_analysis_bmat.sh index caf9af092..28dab42cc 100755 --- a/scripts/exgdas_global_marine_analysis_bmat.sh +++ b/scripts/exgdas_global_marine_analysis_bmat.sh @@ -87,7 +87,7 @@ else fi ################################################################################ -# Prepare the diagonal of B +# Prepare the diagonal of the parametric B shopt -s nullglob files=(ocn.bkgerr_stddev.incr.*.nc) echo $files @@ -103,6 +103,51 @@ else fi shopt -u nullglob +################################################################################ +# Write ensemble weights for the hybrid envar +$APRUN_OCNANAL $JEDI_BIN/gdas_socahybridweights.x soca_ensweights.yaml +export err=$?; err_chk +if [ $err -gt 0 ]; then + exit $err +fi + +################################################################################ +# Compute the ens std. dev, ignore ssh variance +# TODO (G): Implement what's below into one single oops application +# 0 - Compute moments of original ensemble, used at the diag of the first +# component of the hybrid B +# 1 - Ensemble perturbations: +# o Vertically Interpolate to the deterministic layers +# o Recenter around 0 to create an ensemble of perturbations +# 2 - Filter members and apply the linear steric height balance to each members +# 3 - Copy h from deterministic to unbalanced perturbations +# 4 - Compute moments of converted ensemble perturbations + +# Compute ensemble moments +clean_yaml soca_clim_ens_moments.yaml +$APRUN_OCNANAL $JEDI_BIN/soca_ensmeanandvariance.x soca_clim_ens_moments.yaml +export err=$?; err_chk +if [ $err -gt 0 ]; then + exit $err +fi + +# Compute ensemble perturbations, vertically remap to cycle's vertical geometry +clean_yaml soca_clim_ens_perts.yaml +$APRUN_OCNANAL $JEDI_BIN/soca_ensrecenter.x soca_clim_ens_perts.yaml +export err=$?; err_chk +if [ $err -gt 0 ]; then + exit $err +fi + +# Vertical filtering of the 3D perturbations and recompute the steric height perturbation +clean_yaml soca_apply_steric.yaml +$APRUN_OCNANAL $JEDI_BIN/soca_convertincrement.x soca_apply_steric.yaml +export err=$?; err_chk +if [ $err -gt 0 ]; then + exit $err +fi + + ################################################################################ # Correlation and Localization operators shopt -s nullglob @@ -120,7 +165,15 @@ fi ################################################################################ # Set decorrelation scales for bump C -$APRUN_OCNANAL $JEDI_BIN/soca_setcorscales.x soca_setcorscales.yaml > soca_setcorscales.out 2>&1 +$APRUN_OCNANAL $JEDI_BIN/soca_setcorscales.x soca_setcorscales.yaml +export err=$?; err_chk +if [ $err -gt 0 ]; then + exit $err +fi + +################################################################################ +# Set localization scales for the hybrid en. var. +$APRUN_OCNANAL $JEDI_BIN/soca_setcorscales.x soca_setlocscales.yaml export err=$?; err_chk if [ $err -gt 0 ]; then exit $err diff --git a/scripts/exgdas_global_marine_analysis_post.py b/scripts/exgdas_global_marine_analysis_post.py index c1a0b4e11..04aaa10a3 100755 --- a/scripts/exgdas_global_marine_analysis_post.py +++ b/scripts/exgdas_global_marine_analysis_post.py @@ -51,6 +51,7 @@ def list_all_files(dir_in, dir_out, wc='*', fh_list=[]): gcyc = str((int(cyc) - 6) % 24).zfill(2) # previous cycle bdatedt = datetime.strptime(cdate, '%Y%m%d%H') - timedelta(hours=3) bdate = datetime.strftime(bdatedt, '%Y-%m-%dT%H:00:00Z') +mdate = datetime.strftime(datetime.strptime(cdate, '%Y%m%d%H'), '%Y-%m-%dT%H:00:00Z') post_file_list = [] @@ -59,15 +60,15 @@ def list_all_files(dir_in, dir_out, wc='*', fh_list=[]): os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.ocninc.nc')]) # Copy of the diagonal of the background error for the cycle -post_file_list.append([os.path.join(anl_dir, f'ocn.bkgerr_stddev.incr.{bdate}.nc'), +post_file_list.append([os.path.join(anl_dir, 'static_ens', f'ocn.orig_ens_stddev.incr.{bdate}.nc'), os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.ocn.bkgerr_stddev.nc')]) -post_file_list.append([os.path.join(anl_dir, f'ice.bkgerr_stddev.incr.{bdate}.nc'), +post_file_list.append([os.path.join(anl_dir, 'static_ens', f'ice.orig_ens_stddev.incr.{bdate}.nc'), os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.ice.bkgerr_stddev.nc')]) # Copy the ice and ocean increments -post_file_list.append([os.path.join(anl_dir, 'Data', f'ocn.3dvarfgat_pseudo.incr.{bdate}.nc'), +post_file_list.append([os.path.join(anl_dir, 'Data', f'ocn.3dvarfgat_pseudo.incr.{mdate}.nc'), os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.ocn.incr.nc')]) -post_file_list.append([os.path.join(anl_dir, 'Data', f'ice.3dvarfgat_pseudo.incr.{bdate}.nc'), +post_file_list.append([os.path.join(anl_dir, 'Data', f'ice.3dvarfgat_pseudo.incr.{mdate}.nc'), os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.ice.incr.nc')]) # Copy DA grid (computed for the start of the window) @@ -75,9 +76,9 @@ def list_all_files(dir_in, dir_out, wc='*', fh_list=[]): os.path.join(com_ocean_analysis, f'{RUN}.t{bcyc}z.ocngrid.nc')]) # Copy the analysis at the start of the window -post_file_list.append([os.path.join(anl_dir, 'Data', f'ocn.3dvarfgat_pseudo.an.{bdate}.nc'), +post_file_list.append([os.path.join(anl_dir, 'Data', f'ocn.3dvarfgat_pseudo.an.{mdate}.nc'), os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.ocnana.nc')]) -post_file_list.append([os.path.join(anl_dir, 'Data', f'ice.3dvarfgat_pseudo.an.{bdate}.nc'), +post_file_list.append([os.path.join(anl_dir, 'Data', f'ice.3dvarfgat_pseudo.an.{mdate}.nc'), os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.iceana.nc')]) # Copy the CICE analysis restart diff --git a/scripts/exgdas_global_marine_analysis_prep.py b/scripts/exgdas_global_marine_analysis_prep.py index 21af4bcc7..a6bef66bc 100755 --- a/scripts/exgdas_global_marine_analysis_prep.py +++ b/scripts/exgdas_global_marine_analysis_prep.py @@ -22,6 +22,7 @@ import sys import yaml import glob +import copy import dateutil.parser as dparser import f90nml import shutil @@ -168,7 +169,8 @@ def gen_bkg_list(bkg_path, out_path, window_begin=' ', yaml_name='bkg.yaml', ice 'ocn_filename': ocn_filename, 'ice_filename': agg_ice_filename, 'read_from_file': 1, - 'remap_filename': './bkg/'+ocn_filename_ic} + '#remap_filename': './bkg/'+ocn_filename_ic} # TODO: Remapping bug in soca. Switch to z* + bkg_date = bkg_date + timedelta(hours=dt_pseudo) # TODO: make the bkg interval a configurable bkg_list.append(bkg_dict) @@ -233,8 +235,10 @@ def find_clim_ens(input_date): # Variables of convenience half_assim_freq = timedelta(hours=int(os.getenv('assim_freq'))/2) +window_middle = datetime.strptime(os.getenv('PDY')+os.getenv('cyc'), '%Y%m%d%H') window_begin = datetime.strptime(os.getenv('PDY')+os.getenv('cyc'), '%Y%m%d%H') - half_assim_freq window_begin_iso = window_begin.strftime('%Y-%m-%dT%H:%M:%SZ') +window_middle_iso = window_middle.strftime('%Y-%m-%dT%H:%M:%SZ') fcst_begin = datetime.strptime(os.getenv('PDY')+os.getenv('cyc'), '%Y%m%d%H') RUN = os.getenv('RUN') cyc = os.getenv('cyc') @@ -254,6 +258,7 @@ def find_clim_ens(input_date): 'r2d2_obs_dump': os.getenv('R2D2_OBS_DUMP'), 'r2d2_obs_db': os.getenv('R2D2_OBS_DB'), 'ATM_WINDOW_BEGIN': window_begin_iso, + 'ATM_WINDOW_MIDDLE': window_middle_iso, 'ATM_WINDOW_LENGTH': f"PT{os.getenv('assim_freq')}H"} stage_cfg = YAMLFile(path=os.path.join(gdas_home, 'parm', 'templates', 'stage.yaml')) stage_cfg = Template.substitute_structure(stage_cfg, TemplateConstants.DOUBLE_CURLY_BRACES, envconfig.get) @@ -274,7 +279,12 @@ def find_clim_ens(input_date): logging.info(f"******* {obs_file}") obs_src = os.path.join(os.getenv('COM_OBS'), obs_file) obs_dst = os.path.join(os.path.abspath(obs_in), obs_file) - obs_list.append([obs_src, obs_dst]) + if os.path.exists(obs_src): + logging.info(f"******* fetching {obs_file}") + obs_list.append([obs_src, obs_dst]) + else: + logging.info(f"******* {obs_file} is not in the database") + FileHandler({'copy': obs_list}).sync() ################################################################################ @@ -301,6 +311,8 @@ def find_clim_ens(input_date): clim_ens_member_list = [] clim_ens_dir = find_clim_ens(pytz.utc.localize(window_begin, is_dst=None)) clim_ens_size = len(glob.glob(os.path.abspath(os.path.join(clim_ens_dir, 'ocn.*.nc')))) +os.environ['CLIM_ENS_SIZE'] = str(clim_ens_size) + for domain in ['ocn', 'ice']: for mem in range(1, clim_ens_size+1): fname = domain+"."+str(mem)+".nc" @@ -338,6 +350,51 @@ def find_clim_ens(input_date): config = Template.substitute_structure(config, TemplateConstants.DOLLAR_PARENTHESES, envconfig.get) config.save(berr_yaml) +################################################################################ +# generate YAMLS file for diag of clim. ens. B +berror_yaml_dir = os.path.join(gdas_home, 'parm', 'soca', 'berror') + +logging.info(f"---------------- generate soca_clim_moments.yaml") +berr_yaml = os.path.join(anl_dir, 'soca_clim_ens_moments.yaml') +berr_yaml_template = os.path.join(berror_yaml_dir, 'soca_clim_ens_moments.yaml') +config = YAMLFile(path=berr_yaml_template) +config = Template.substitute_structure(config, TemplateConstants.DOUBLE_CURLY_BRACES, envconfig.get) +config = Template.substitute_structure(config, TemplateConstants.DOLLAR_PARENTHESES, envconfig.get) +config.save(berr_yaml) + +logging.info(f"---------------- generate soca_clim_ens_perts.yaml") +berr_yaml = os.path.join(anl_dir, 'soca_clim_ens_perts.yaml') +berr_yaml_template = os.path.join(berror_yaml_dir, 'soca_clim_ens_perts.yaml') +config = YAMLFile(path=berr_yaml_template) +config = Template.substitute_structure(config, TemplateConstants.DOUBLE_CURLY_BRACES, envconfig.get) +config = Template.substitute_structure(config, TemplateConstants.DOLLAR_PARENTHESES, envconfig.get) +config.save(berr_yaml) + +logging.info(f"---------------- generate soca_apply_steric.yaml") +berr_yaml = os.path.join(anl_dir, 'soca_apply_steric.yaml') +berr_yaml_template = os.path.join(berror_yaml_dir, 'soca_apply_steric.yaml') +config = YAMLFile(path=berr_yaml_template) +config = Template.substitute_structure(config, TemplateConstants.DOUBLE_CURLY_BRACES, envconfig.get) +config = Template.substitute_structure(config, TemplateConstants.DOLLAR_PARENTHESES, envconfig.get) +member_template = config['increments'][0] +ocn_fname_tmpl = member_template['input']['ocn_filename'] +ice_fname_tmpl = member_template['input']['ice_filename'] +config['increments'] = [] +for n in range(1, clim_ens_size+1): + member = copy.deepcopy(member_template) + member['input']['ocn_filename'] = member['input']['ocn_filename'].replace("MEMNUM", str(n)) + member['input']['ice_filename'] = member['input']['ice_filename'].replace("MEMNUM", str(n)) + member['output']['exp'] = member['output']['exp'].replace("MEMNUM", str(n)) + config['increments'].append(member) +config.save(berr_yaml) + +logging.info(f"---------------- generate soca_ensweights.yaml") +berr_yaml = os.path.join(anl_dir, 'soca_ensweights.yaml') +berr_yaml_template = os.path.join(berror_yaml_dir, 'soca_ensweights.yaml') +config = YAMLFile(path=berr_yaml_template) +config = Template.substitute_structure(config, TemplateConstants.DOUBLE_CURLY_BRACES, envconfig.get) +config.save(berr_yaml) + ################################################################################ # copy yaml for decorrelation length scales @@ -346,6 +403,14 @@ def find_clim_ens(input_date): corscales_yaml_dst = os.path.join(stage_cfg['stage_dir'], 'soca_setcorscales.yaml') FileHandler({'copy': [[corscales_yaml_src, corscales_yaml_dst]]}).sync() +################################################################################ +# copy yaml for localization length scales + +logging.info(f"---------------- generate soca_setlocscales.yaml") +locscales_yaml_src = os.path.join(gdas_home, 'parm', 'soca', 'berror', 'soca_setlocscales.yaml') +locscales_yaml_dst = os.path.join(stage_cfg['stage_dir'], 'soca_setlocscales.yaml') +FileHandler({'copy': [[locscales_yaml_src, locscales_yaml_dst]]}).sync() + ################################################################################ # generate yaml for bump/nicas (used for correlation and/or localization) @@ -443,6 +508,7 @@ def find_clim_ens(input_date): ufsda.yamltools.save_check(varconfig.as_dict(), target=var_yaml, app='var') ################################################################################ +# Prepare the yamls for the "checkpoint" jjob # prepare yaml and CICE restart for soca to cice change of variable logging.info(f"---------------- generate soca to cice yamls") @@ -458,8 +524,8 @@ def find_clim_ens(input_date): "template": "", "output": "", "config": { - "OCN_ANA": "./Data/ocn.3dvarfgat_pseudo.an."+window_begin_iso+".nc", - "ICE_ANA": "./Data/ice.3dvarfgat_pseudo.an."+window_begin_iso+".nc", + "OCN_ANA": "./Data/ocn.3dvarfgat_pseudo.an."+window_middle_iso+".nc", + "ICE_ANA": "./Data/ice.3dvarfgat_pseudo.an."+window_middle_iso+".nc", "ICE_RST": ice_rst_ana, "FCST_BEGIN": fcst_begin.strftime('%Y-%m-%dT%H:%M:%SZ') } diff --git a/test/soca/testinput/socaincr2mom6.yaml b/test/soca/testinput/socaincr2mom6.yaml index 0b11b893d..a5b5cf600 100644 --- a/test/soca/testinput/socaincr2mom6.yaml +++ b/test/soca/testinput/socaincr2mom6.yaml @@ -17,7 +17,7 @@ vertical geometry: soca increment: date: 2018-04-15T09:00:00Z basename: ./Data/ - ocn_filename: 'ocn.3dvarfgat_pseudo.incr.2018-04-15T09:00:00Z.nc' + ocn_filename: 'ocn.3dvarfgat_pseudo.incr.2018-04-15T12:00:00Z.nc' read_from_file: 1 mom6 iau increment: From 7966501512c5309ca13e46387ca1b445d4bac3dd Mon Sep 17 00:00:00 2001 From: Cory Martin Date: Tue, 25 Jul 2023 08:18:23 -0400 Subject: [PATCH 44/94] Merge in develop for Jiarui's PR to have a commit hash (#543) * Prepare GTS snow depth observations for JEDI-based Land DA (#541) * Initiate to process the gts bufr data into the ioda format. * Change the io paths for matching the global-workflow. * Modify the ctest for the bufr2ioda yaml files. * Filtering of the offline ensemble members, and more ... (#539) * filter offline ensemble * fixed py norm * point to public oops * update for oops 2258, point ufo to dev * reverted ufo branch and soca obs list * wrong date in yaml --------- Co-authored-by: Jiarui Dong Co-authored-by: Guillaume Vernieres From 0f8ed3d7d4d9532659d9100275ddc38c46629e24 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 4 Aug 2023 16:10:20 -0400 Subject: [PATCH 45/94] Revert to stable hashes for all --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 783f04a5d..0243a4cc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ if(BUILD_GDASBUNDLE) # External (required) observation operators option("BUNDLE_SKIP_CRTM" "Don't build CRTM" "OFF") # Don't build crtm unless user passes -DBUNDLE_SKIP_CRTM=OFF - ecbuild_bundle( PROJECT crtm GIT "https://github.com/JCSDA/crtm.git" TAG v2.4.1-jedi.1 ) + ecbuild_bundle( PROJECT crtm GIT "https://github.com/ADCollard/crtm.git" TAG v2.3-jedi.3_fix ) # Build GSI-B option(BUILD_GSIBEC "Build GSI-B" OFF) @@ -92,9 +92,9 @@ if(BUILD_GDASBUNDLE) if ( BUILD_ICEPACK ) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() - ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" BRANCH develop ) - ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" BRANCH main-ecbuild RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/change_mask_value ) + ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) + ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 33274de ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) From 09757ceafc2942cc72a5be16ffc508a01e7c735a Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 4 Aug 2023 16:12:01 -0400 Subject: [PATCH 46/94] back to crtm 2.4 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0243a4cc0..f055da0c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ if(BUILD_GDASBUNDLE) # External (required) observation operators option("BUNDLE_SKIP_CRTM" "Don't build CRTM" "OFF") # Don't build crtm unless user passes -DBUNDLE_SKIP_CRTM=OFF - ecbuild_bundle( PROJECT crtm GIT "https://github.com/ADCollard/crtm.git" TAG v2.3-jedi.3_fix ) + ecbuild_bundle( PROJECT crtm GIT "https://github.com/JCSDA/crtm.git" TAG v2.4.1-jedi.1 ) # Build GSI-B option(BUILD_GSIBEC "Build GSI-B" OFF) From 2774a104b3210341bcb0b3f561ec6fb094cb6e6d Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 16 Aug 2023 07:35:05 +0000 Subject: [PATCH 47/94] Update to new stable build on 20230816 --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f055da0c3..bfc66b6fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,11 +71,11 @@ if(BUILD_GDASBUNDLE) endif() # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG e788663 ) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 68ebc46 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG b700b28 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 135bdf0 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e4144cb ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 36452cc ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG d6f5419 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG cb8a074 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 43dd7dd ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG d98de90 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -83,8 +83,8 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) - ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG a934a7b ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG ff733c4 ) + ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9b1c793 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 1952692 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -94,7 +94,7 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 33274de ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG d1fae8d ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) @@ -102,7 +102,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 58cb1d8 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG aa38b19 ) endif() # Land associated repositories From 0bc9be8569402123f9aeea61ca608f2c97d2b62b Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 17 Aug 2023 07:43:03 +0000 Subject: [PATCH 48/94] Update to new stable build on 20230817 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bfc66b6fb..970da40a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,8 +74,8 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 36452cc ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG d6f5419 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG cb8a074 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 43dd7dd ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG d98de90 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 1210ac0 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG deb2777 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -94,7 +94,7 @@ if(BUILD_GDASBUNDLE) endif() ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG d1fae8d ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG cf2a3d4 ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) @@ -102,7 +102,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG aa38b19 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" BRANCH develop ) endif() # Land associated repositories From be2570738a9b9f3b4c0b99f3e9c6bf4e064df237 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 1 Sep 2023 07:48:50 +0000 Subject: [PATCH 49/94] Update to new stable build on 20230901 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc35ac075..8276bb74c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,9 +76,9 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 207f9bd ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 8b58dc0 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 2b505d4 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 8dbcb71 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG e821241 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG b84d8f1 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1f7ff52 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG dc730ae ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG efb73bb ) endif() # Land associated repositories From 8110a49b0c91dcb76abcd222c4f21c4b1378eecd Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sun, 3 Sep 2023 08:00:22 +0000 Subject: [PATCH 50/94] Update to new stable build on 20230903 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8276bb74c..e09bc5809 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 207f9bd ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 8b58dc0 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 8dbcb71 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG e821241 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 9cf4d00 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1f7ff52 ) # FMS and FV3 dynamical core From d647dd9e67d84cfd862ee7dbf5ebd5aedfef9849 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 6 Sep 2023 07:36:00 +0000 Subject: [PATCH 51/94] Update to new stable build on 20230906 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e09bc5809..3c8584f73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,10 +74,10 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 207f9bd ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0cc138f ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 8b58dc0 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 8dbcb71 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 9cf4d00 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 2dc6edc ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1f7ff52 ) # FMS and FV3 dynamical core @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG efb73bb ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 5e7ce8e ) endif() # Land associated repositories From ac8fdb17eb297bc2133b551eab494f008bc29b4c Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 7 Sep 2023 08:02:03 +0000 Subject: [PATCH 52/94] Update to new stable build on 20230907 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c8584f73..81d72cffa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 0cc138f ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 48a5be5 ) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 8b58dc0 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 8dbcb71 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 2dc6edc ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1f7ff52 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG d66b6ba ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -87,7 +87,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9b1c793 ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 34c4da5 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG a3c4a0f ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github From c6620c05139c71ee1dabd5a0e60a0dca2b7c054f Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 12 Sep 2023 07:48:33 +0000 Subject: [PATCH 53/94] Update to new stable build on 20230912 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6e588b26..0ec2e60a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 045c1ff) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 75bbb38) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG b707645 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 8dbcb71 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 9719fde ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG f447e1f ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG dbab4b3 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 19c0de1 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG fce74c5 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) From d347d22fb91ccdaf947d2d8cddb0e2281e3997d4 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 13 Sep 2023 07:34:52 +0000 Subject: [PATCH 54/94] Update to new stable build on 20230913 --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ec2e60a6..b48978bb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 75bbb38) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG c74956c) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG b707645 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG dbab4b3 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 19c0de1 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG fce74c5 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 6a22e64 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 752dc2a ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG ae553b5 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 240beff ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG bf92e5a ) endif() # Land associated repositories From 0d97b714c042edd87a4ecae8113461a1773faace Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 14 Sep 2023 07:37:04 +0000 Subject: [PATCH 55/94] Update to new stable build on 20230914 --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b48978bb0..77adf2cac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG c74956c) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 7a7dd98) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG b707645 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 6a22e64 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 752dc2a ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG ae553b5 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 723dd94 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 0d63f59 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -96,7 +96,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG d0f56a7 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 7c518d0 ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG bf92e5a ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG cb2c6c8 ) endif() # Land associated repositories From c7b706427937a95b918a886efbf806c8f109f12f Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 15 Sep 2023 07:49:59 +0000 Subject: [PATCH 56/94] Update to new stable build on 20230915 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77adf2cac..12e315a50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 7a7dd98) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 812ce65) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG b707645 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 6a22e64 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 3e049a8 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 723dd94 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 0d63f59 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG ce3c480 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) From 6e7900306c0f8d9c8efc1f87fd05a22ccd15e483 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sun, 17 Sep 2023 07:28:45 +0000 Subject: [PATCH 57/94] Update to new stable build on 20230917 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12e315a50..f79ae1f15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG b707645 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 3e049a8 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 723dd94 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG ce3c480 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e139c1c ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -87,7 +87,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9b1c793 ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 272c87d ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 552d43b ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG cb2c6c8 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 7c9c0fc ) endif() # Land associated repositories From f70ecdbd153801cb6154a4a2ba5af4cbdaefceab Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 19 Sep 2023 07:36:18 +0000 Subject: [PATCH 58/94] Update to new stable build on 20230919 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f79ae1f15..bad81edca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 812ce65) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG f09288b) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG b707645 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 3e049a8 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 30f98d6 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 723dd94 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e139c1c ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 106d081 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) From 5766b4d58a6ddddb95eda89cbb7efac5f69d2a25 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 20 Sep 2023 07:39:58 +0000 Subject: [PATCH 59/94] Update to new stable build on 20230920 --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bad81edca..0e01b49f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG f09288b) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG a86234e) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG b707645 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 30f98d6 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 723dd94 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 106d081 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 05d03e3 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 08f56eb ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e6c6246 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -87,7 +87,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9b1c793 ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 552d43b ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG a47f170 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 7c9c0fc ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG db1985b ) endif() # Land associated repositories From f4aa388b2669abafa96c62e6ff5afa19aab572bc Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 21 Sep 2023 07:38:36 +0000 Subject: [PATCH 60/94] Update to new stable build on 20230921 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e01b49f7..4d63a102b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,9 +76,9 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG a86234e) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG b707645 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 05d03e3 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 3312494 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 08f56eb ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e6c6246 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 4ed088b ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) From 08c7ce5f1a20c07d3f60882f5f1e95a9b07d5ba7 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 22 Sep 2023 07:41:57 +0000 Subject: [PATCH 61/94] Update to new stable build on 20230922 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d63a102b..20112be21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,8 +76,8 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG a86234e) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG b707645 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 3312494 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 08f56eb ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 30ba849 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fa194f9 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 4ed088b ) # FMS and FV3 dynamical core @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG db1985b ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 8a296cc ) endif() # Land associated repositories From 16a2b93c1c92e7086503bbdba81517eb05d9c6b9 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 23 Sep 2023 07:44:47 +0000 Subject: [PATCH 62/94] Update to new stable build on 20230923 --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20112be21..75e3a95a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,10 +75,10 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG a86234e) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG b707645 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 30ba849 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG fa194f9 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 4ed088b ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 8af30f7 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG a7f8b3a ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG a4dbd4c ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG f9fbcd6 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -86,8 +86,8 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) - ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9b1c793 ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG a47f170 ) + ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9758fbd ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 294744d ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github From 613dbdbe072efdcc59a876f942cbde75cca2379d Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 27 Sep 2023 07:58:57 +0000 Subject: [PATCH 63/94] Update to new stable build on 20230927 --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75e3a95a6..b442743d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,10 +75,10 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG a86234e) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 8af30f7 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG a7f8b3a ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG a4dbd4c ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG f9fbcd6 ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 17173dc ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG de99a5a ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 9927601 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG cfdf725 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -87,7 +87,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9758fbd ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 294744d ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG e95c064 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -96,7 +96,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 7c518d0 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG fc4677b ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 8a296cc ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG a6e568d ) endif() # Land associated repositories From d07c72981eb92e760a5bf53d601c03fb013b183d Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 5 Oct 2023 07:34:41 +0000 Subject: [PATCH 64/94] Update to new stable build on 20231005 --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b442743d0..3aee024e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG a86234e) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 2c56267) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 17173dc ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG de99a5a ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 9927601 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG cfdf725 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 89dcff0 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 648a336 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 496dced ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -87,7 +87,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9758fbd ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG e95c064 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG b7eaf43 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG a6e568d ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 877c777 ) endif() # Land associated repositories From e4deabfe1186cc324ee916b7e2364c9b8070364b Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 6 Oct 2023 07:54:45 +0000 Subject: [PATCH 65/94] Update to new stable build on 20231006 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3aee024e3..35b603ea5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,9 +76,9 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 2c56267) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 17173dc ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 89dcff0 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 43288e8 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 648a336 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 496dced ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG b359747 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -87,7 +87,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9758fbd ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG b7eaf43 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 94443f8 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github From ec4a5dc12e4bc9ee218f73a0318d269482cc7e26 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 7 Oct 2023 07:48:53 +0000 Subject: [PATCH 66/94] Update to new stable build on 20231007 --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35b603ea5..71903060c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 2c56267) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 17173dc ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 43288e8 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 648a336 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG b359747 ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 48fa77d) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 24a77ff ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG db0e690 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 7deca0e ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG d7ccfec ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -87,7 +87,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9758fbd ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 94443f8 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG d8c5ffa ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 877c777 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 94fb6cf ) endif() # Land associated repositories From 4e95c0d3637672c538a4dbf3e0060163e404a11b Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Mon, 9 Oct 2023 07:45:53 +0000 Subject: [PATCH 67/94] Update to new stable build on 20231009 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71903060c..ae4f90d4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 24a77ff ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG db0e690 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 7deca0e ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG d7ccfec ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG dcfbdbf ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) From 6403fa047c2c9ccb0b8ae1ce64fc24220b6607d2 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 12 Oct 2023 07:48:40 +0000 Subject: [PATCH 68/94] Update to new stable build on 20231012 --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae4f90d4f..f896c8051 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 48fa77d) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 24a77ff ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG db0e690 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 7deca0e ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG dcfbdbf ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG b26281b) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 32a9e38 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG c5bf709 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1865911 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -87,7 +87,7 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9758fbd ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG d8c5ffa ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 71e38b5 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -96,7 +96,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG fc4677b ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG e2049c1 ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 94fb6cf ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG d99ad21 ) endif() # Land associated repositories From eed7304dd8ae9275e616e16ead48b9c53ee174d8 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 13 Oct 2023 07:47:06 +0000 Subject: [PATCH 69/94] Update to new stable build on 20231013 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f896c8051..ebc762e28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,7 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG b26281b) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 32a9e38 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 5c574e9 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG c5bf709 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1865911 ) From 5c0ad138994e1f333173e1ef9d5be48032db75b4 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 14 Oct 2023 07:55:43 +0000 Subject: [PATCH 70/94] Update to new stable build on 20231014 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebc762e28..b32242fc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,11 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG b26281b) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 27022a3) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 5c574e9 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG c5bf709 ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1865911 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG ed54d1a ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 0d057a2 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG d99ad21 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 9ceef77 ) endif() # Land associated repositories From dd82056d28fc36d2bed6acd6204d91466c2a8a51 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 17 Oct 2023 07:39:14 +0000 Subject: [PATCH 71/94] Update to new stable build on 20231017 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b32242fc6..befd793aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 27022a3) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 6b268e8) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 5c574e9 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG ed54d1a ) @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 9ceef77 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG ff38595 ) endif() # Land associated repositories From 033da7d1890732ece4306838ffc965c889ef08cb Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 18 Oct 2023 07:55:51 +0000 Subject: [PATCH 72/94] Update to new stable build on 20231018 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index befd793aa..6a036355f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 6b268e8) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 695ad95) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 5c574e9 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG ed54d1a ) @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG ff38595 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG f37cd37 ) endif() # Land associated repositories From c4d63ab861dd844466be87814daf09d01b9988c1 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 19 Oct 2023 07:46:10 +0000 Subject: [PATCH 73/94] Update to new stable build on 20231019 --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a036355f..a864dd63f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,10 +74,10 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 695ad95) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1307ea3) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 5c574e9 ) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG ed54d1a ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG f117ec0 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 11218a7 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 0d057a2 ) # FMS and FV3 dynamical core @@ -96,7 +96,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG e2049c1 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 12befe9 ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) @@ -104,7 +104,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG f37cd37 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 0cedc8c ) endif() # Land associated repositories From 3043f9afb45677c1dde86df9042844d4b0ef079a Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 25 Oct 2023 07:42:55 +0000 Subject: [PATCH 74/94] Update to new stable build on 20231025 --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bcfd63b62..0ca3270fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,13 +74,13 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG d71a8cf) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 526882f) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG f117ec0 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG e8f9062 ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 337c885 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 6e9b56a ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -88,9 +88,9 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) - ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 9758fbd ) + ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG aa43b60 ) option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 13f7242 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 8fd2c2b ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 12befe9 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG ef327de ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) From 1a86cba7519d2a061e2585ce7eb85c9cd463d41f Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 26 Oct 2023 08:13:10 +0000 Subject: [PATCH 75/94] Update to new stable build on 20231026 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ca3270fa..51398dd5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,9 +88,9 @@ if(BUILD_GDASBUNDLE) # fv3-jedi and associated repositories ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) - ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG aa43b60 ) + ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG d68f1a8 ) option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 8fd2c2b ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 9ff292b ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github From e9333563ff6adc54a116866916d8bb6f2fe55e07 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 27 Oct 2023 07:55:42 +0000 Subject: [PATCH 76/94] Update to new stable build on 20231027 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51398dd5e..27fb89c05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG f117ec0 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG e8f9062 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 755d867 ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 6e9b56a ) From a321e7edb555ae379a99a665deb76f8d38d9d1c0 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sun, 29 Oct 2023 08:01:00 +0000 Subject: [PATCH 77/94] Update to new stable build on 20231029 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27fb89c05..1ab69b6c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 526882f) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 98b2b71) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG f117ec0 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) From 44cc65ccb008a4a03b0a0ac99880a1fcf99b1921 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 31 Oct 2023 08:03:35 +0000 Subject: [PATCH 78/94] Update to new stable build on 20231031 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ab69b6c0..e39a0ed3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,11 +76,11 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 98b2b71) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG f117ec0 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG a96c7e9 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 755d867 ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 6e9b56a ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 2de2a5f ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -90,7 +90,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG d68f1a8 ) option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 9ff292b ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 07e3621 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github From 33097cdfc0a5674c1f440c6b1a934ce13b011bcc Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 1 Nov 2023 07:16:47 +0000 Subject: [PATCH 79/94] Update to new stable build on 20231101 --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e39a0ed3a..4c278ad31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,12 +75,12 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 98b2b71) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG f5af894 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG a96c7e9 ) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 78068f8 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 184e666 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 755d867 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG e226cb8 ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 2de2a5f ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG da6d536 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -107,7 +107,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG cb93086 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 319c7bf ) endif() # Land associated repositories From 0c31b17b53b0ccfdd9f450f955adf78a30c4ff74 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 4 Nov 2023 07:28:18 +0000 Subject: [PATCH 80/94] Update to new stable build on 20231104 --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c278ad31..5212c64ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,13 +74,13 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 98b2b71) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG e1c9a6f) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 78068f8 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 184e666 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 47c9e7a ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG e226cb8 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG aeb3997 ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG da6d536 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 4902dcd ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -90,7 +90,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG d68f1a8 ) option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 07e3621 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG cd1c0cd ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG ef327de ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 30daee8 ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) @@ -107,7 +107,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 319c7bf ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 5a0e957 ) endif() # Land associated repositories From efd928578cdf074d016db8c9f2b12e95d57ec8fe Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 7 Nov 2023 07:15:38 +0000 Subject: [PATCH 81/94] Update to new stable build on 20231107 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5212c64ba..6cc99f59f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,7 +107,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 5a0e957 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 15132a2 ) endif() # Land associated repositories From 13d7b2f85218a30638dd36a7dea9ce1bc1f3098d Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 17 Nov 2023 07:18:48 +0000 Subject: [PATCH 82/94] Update to new stable build on 20231117 --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cc99f59f..4e23592e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,13 +74,13 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG e1c9a6f) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 78068f8 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 47c9e7a ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 475657d) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 4849792 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG fbc37c6 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG aeb3997 ) + ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG b27373f ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 4902dcd ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e15f443 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -90,7 +90,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG d68f1a8 ) option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG cd1c0cd ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG b27975e ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 30daee8 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG e658994 ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) @@ -107,7 +107,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 15132a2 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 7bf31ab ) endif() # Land associated repositories From 070aea355129755564eb752da20543b6671efece Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Sat, 18 Nov 2023 07:24:28 +0000 Subject: [PATCH 83/94] Update to new stable build on 20231118 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e23592e4..392ae56c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,11 +76,11 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 475657d) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 4849792 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG fbc37c6 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG edc58d5 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG b27373f ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG e15f443 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 77f2339 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) From 7ea5bb051f142f75603fcca564519d153c5b3ceb Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 22 Nov 2023 07:34:55 +0000 Subject: [PATCH 84/94] Update to new stable build on 20231122 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 392ae56c3..0ae8e2fe5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,11 +76,11 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 475657d) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 4849792 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG edc58d5 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 84f4573 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG b27373f ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 77f2339 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 7d5429b ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -90,7 +90,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG d68f1a8 ) option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG b27975e ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 2ffdbfc ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github From 3aa1d27eac43a4c434e20ec1d6a4330110f840d6 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 23 Nov 2023 07:17:47 +0000 Subject: [PATCH 85/94] Update to new stable build on 20231123 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ae8e2fe5..970a1d94a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 475657d) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 98c6bfa) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 4849792 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 84f4573 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) @@ -90,7 +90,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG d68f1a8 ) option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 2ffdbfc ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 62e25b7 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github From 2154b148a82a7709252eb2106bdb87ad8e240132 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 28 Nov 2023 07:29:09 +0000 Subject: [PATCH 86/94] Update to new stable build on 20231128 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 970a1d94a..aa1916c73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,13 +74,13 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 98c6bfa) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 64d31f9) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 4849792 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 84f4573 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG b27373f ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 7d5429b ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG af85dd4 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -90,7 +90,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG d68f1a8 ) option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 62e25b7 ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG ca42e3d ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -107,7 +107,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 7bf31ab ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 58edb18 ) endif() # Land associated repositories From 15c57bb3fd4a776f818b6fcc001927a850f61fac Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 29 Nov 2023 07:28:31 +0000 Subject: [PATCH 87/94] Update to new stable build on 20231129 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa1916c73..44cb25f80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ if(BUILD_GDASBUNDLE) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG b27373f ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG af85dd4 ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG ecaba3a ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) From 1d224989f4de844508291db108e378e79cf13909 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 5 Dec 2023 07:15:54 +0000 Subject: [PATCH 88/94] Update to new stable build on 20231205 --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 986bdbd22..7d4b50019 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,13 +74,13 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda-internal/GSW-Fortran.git" TAG 1a02eba ) # Core JEDI repositories - ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 64d31f9) - ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 4849792 ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 84f4573 ) + ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1aa83c9) + ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 099cb5d ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 660bdae ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG b27373f ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG ecaba3a ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 3eda06c ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) @@ -90,7 +90,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG d68f1a8 ) option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG ca42e3d ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 702ac6b ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github @@ -99,7 +99,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT icepack GIT "https://github.com/JCSDA-internal/Icepack.git" BRANCH feature/ecbuild-new ) endif() ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" TAG 51ec489 RECURSIVE ) - ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG e658994 ) + ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" TAG 0abcfab ) # Build JEDI/DA or other peripherals ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" ) @@ -107,7 +107,7 @@ if(BUILD_GDASBUNDLE) # Build IODA converters option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON) if(BUILD_IODA_CONVERTERS) - ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG 58edb18 ) + ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA-internal/ioda-converters.git" TAG c4f1731 ) endif() # Land associated repositories From 69fd625f9b0fc6bca1cf8f2fc04666c1567b383c Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Wed, 6 Dec 2023 07:13:48 +0000 Subject: [PATCH 89/94] Update to new stable build on 20231206 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d4b50019..f70b00bd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,11 +76,11 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1aa83c9) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 099cb5d ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 660bdae ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 31a9339 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG b27373f ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 3eda06c ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG bf397e9 ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1f73914 ) From f44a6d500dda2aba491e4fa12c0bee428ddb7b80 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Thu, 7 Dec 2023 07:14:37 +0000 Subject: [PATCH 90/94] Update to new stable build on 20231207 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f70b00bd6..77fae8282 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,7 @@ if(BUILD_GDASBUNDLE) # Core JEDI repositories ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1aa83c9) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 099cb5d ) - ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 31a9339 ) + ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 3a54cc2 ) option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG b27373f ) option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON) @@ -90,7 +90,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG cb39681 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG d68f1a8 ) option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 702ac6b ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG dc08e13 ) # SOCA associated repositories # TODO: Move the Icepack fork to EMC github From 3652d9cec0404fea0d4e8a439c249da242f8f8b4 Mon Sep 17 00:00:00 2001 From: PraveenKumar-NOAA <63739712+PraveenKumar-NOAA@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:45:02 -0500 Subject: [PATCH 91/94] Updated adpupa prepbufr api for the ObsError group variables (#840) This PR updates the adpupa prepbufr api for the ObsError group variables and also updates the function for the dateiTme variable. The following file has been changed: ~/ush/ioda/bufr2ioda/bufr2ioda_adpupa_prepbufr.py --------- Co-authored-by: RussTreadon-NOAA Co-authored-by: Emily Liu Co-authored-by: Cory Martin Co-authored-by: emilyhcliu <36091766+emilyhcliu@users.noreply.github.com> Co-authored-by: BrettHoover-NOAA <98188219+BrettHoover-NOAA@users.noreply.github.com> Co-authored-by: Brett Hoover Co-authored-by: Xuanli Li <101414760+XuanliLi-NOAA@users.noreply.github.com> Co-authored-by: RussTreadon-NOAA <26926959+RussTreadon-NOAA@users.noreply.github.com> Co-authored-by: PraveenKumar-NOAA --- .../bufr2ioda/bufr2ioda_adpupa_prepbufr.py | 110 +++++++++++++++++- 1 file changed, 106 insertions(+), 4 deletions(-) diff --git a/ush/ioda/bufr2ioda/bufr2ioda_adpupa_prepbufr.py b/ush/ioda/bufr2ioda/bufr2ioda_adpupa_prepbufr.py index 40a5bc9b9..97528f51d 100755 --- a/ush/ioda/bufr2ioda/bufr2ioda_adpupa_prepbufr.py +++ b/ush/ioda/bufr2ioda/bufr2ioda_adpupa_prepbufr.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# (C) Copyright 2023 NOAA/NWS/NCEP/EMC +# (C) Copyright 2024 NOAA/NWS/NCEP/EMC # # This software is licensed under the terms of the Apache Licence Version 2.0 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. @@ -11,6 +11,7 @@ import calendar import json import time +import copy import math import datetime import os @@ -34,8 +35,16 @@ def Compute_dateTime(cycleTimeSinceEpoch, hrdr): - hrdr = np.int64(hrdr*3600) - dateTime = hrdr + cycleTimeSinceEpoch + int64_fill_value = np.int64(0) + dateTime = np.zeros(hrdr.shape, dtype=np.int64) + for i in range(len(dateTime)): + if ma.is_masked(hrdr[i]): + continue + else: + dateTime[i] = np.int64(hrdr[i]*3600) + cycleTimeSinceEpoch + + dateTime = ma.array(dateTime) + dateTime = ma.masked_values(dateTime, int64_fill_value) return dateTime @@ -106,6 +115,13 @@ def bufr_to_ioda(config, logger): q.add('windEastwardQM', '*/PRSLEVEL/W___INFO/W__EVENT{1}/WQM') q.add('windNorthwardQM', '*/PRSLEVEL/W___INFO/W__EVENT{1}/WQM') + # ObsError + q.add('pressureOE', '*/PRSLEVEL/P___INFO/P__BACKG/POE') + q.add('airTemperatureOE', '*/PRSLEVEL/T___INFO/T__BACKG/TOE') + q.add('specificHumidityOE', '*/PRSLEVEL/Q___INFO/Q__BACKG/QOE') + q.add('windEastwardOE', '*/PRSLEVEL/W___INFO/W__BACKG/WOE') + q.add('windNorthwardOE', '*/PRSLEVEL/W___INFO/W__BACKG/WOE') + end_time = time.time() running_time = end_time - start_time logger.debug(f'Running time for making QuerySet : {running_time} seconds') @@ -134,7 +150,7 @@ def bufr_to_ioda(config, logger): zob = r.get('height', 'prepbufrDataLevelCategory', type='float') # Time variable - hrdr = r.get('timeOffset', 'prepbufrDataLevelCategory', type='int64') + hrdr = r.get('timeOffset', 'prepbufrDataLevelCategory', type='float') ulan = r.get('releaseTime') ulan = np.int64(ulan*3600) @@ -170,6 +186,27 @@ def bufr_to_ioda(config, logger): uobqm = r.get('windEastwardQM', 'prepbufrDataLevelCategory') vobqm = r.get('windNorthwardQM', 'prepbufrDataLevelCategory') + # ObsError + poboe = r.get('pressureOE', 'prepbufrDataLevelCategory', type='float32') + poboe *= 100 + psoe = ma.array(np.full(poboe.shape[0], poboe.fill_value)) + psoe = ma.where(cat == 0, poboe, psoe) + psoe = ma.masked_values(psoe, 0) + toboe = r.get('airTemperatureOE', 'prepbufrDataLevelCategory', type='float32') + toboe = ma.masked_values(toboe, 0) + tsenoe = copy.deepcopy(toboe) + tsenoef = ma.array(np.full(toboe.shape[0], toboe.fill_value)) + tsenoe = ma.where(((tpc >= 1) & (tpc < 8)), toboe, tsenoef) + tsenoe = ma.masked_values(tsenoe, 0) + tvooe = copy.deepcopy(toboe) + tvooef = ma.array(np.full(toboe.shape[0], toboe.fill_value)) + tvooe = ma.where(((tpc == 8)), toboe, tvooef) + tvooe = ma.masked_values(tvooe, 0) + qoboe = r.get('specificHumidityOE', 'prepbufrDataLevelCategory') + qoboe *= 10 + uoboe = r.get('windEastwardOE', 'prepbufrDataLevelCategory') + voboe = r.get('windNorthwardOE', 'prepbufrDataLevelCategory') + logger.info('Executing QuerySet Done!') logger.debug('Executing QuerySet: Check BUFR variable generic dimension and type') @@ -202,6 +239,15 @@ def bufr_to_ioda(config, logger): logger.debug(f' uobqm shape = {uobqm.shape}') logger.debug(f' vobqm shape = {vobqm.shape}') + logger.debug(f" poboe shape = {poboe.shape}") + logger.debug(f" psoe shape = {psoe.shape}") + logger.debug(f" toboe shape = {toboe.shape}") + logger.debug(f" tsenoe shape = {tsenoe.shape}") + logger.debug(f" tvooe shape = {tvooe.shape}") + logger.debug(f" qoboe shape = {qoboe.shape}") + logger.debug(f" uoboe shape = {uoboe.shape}") + logger.debug(f" voboe shape = {voboe.shape}") + logger.debug(f' cat type = {cat.dtype}') logger.debug(f' lat type = {lat.dtype}') logger.debug(f' lon type = {lon.dtype}') @@ -230,6 +276,15 @@ def bufr_to_ioda(config, logger): logger.debug(f' uobqm type = {uobqm.dtype}') logger.debug(f' vobqm type = {vobqm.dtype}') + logger.debug(f" poboe type = {poboe.dtype}") + logger.debug(f" psoe type = {psoe.dtype}") + logger.debug(f" toboe type = {toboe.dtype}") + logger.debug(f" tsenoe type = {tsenoe.dtype}") + logger.debug(f" tvooe type = {tvooe.dtype}") + logger.debug(f" qoboe type = {qoboe.dtype}") + logger.debug(f" uoboe type = {uoboe.dtype}") + logger.debug(f" voboe type = {voboe.dtype}") + end_time = time.time() running_time = end_time - start_time logger.info(f"Running time for executing QuerySet to get ResultSet : {running_time} seconds") @@ -398,6 +453,53 @@ def bufr_to_ioda(config, logger): .write_attr('long_name', 'Northward Wind Quality Marker') \ .write_data(vobqm) + # Pressure Observation Error + obsspace.create_var('ObsError/pressure', dtype=poboe.dtype, fillval=poboe.fill_value) \ + .write_attr('units', 'Pa') \ + .write_attr('long_name', 'Pressure Observation Error') \ + .write_data(poboe) + + # Station Pressure Observation Error + obsspace.create_var('ObsError/stationPressure', dtype=psoe.dtype, fillval=psoe.fill_value) \ + .write_attr('units', 'Pa') \ + .write_attr('long_name', 'Station Pressure Observation Error') \ + .write_data(psoe) + + # Air Temperature Observation Error + obsspace.create_var('ObsError/airTemperature', dtype=toboe.dtype, fillval=toboe.fill_value) \ + .write_attr('units', 'K') \ + .write_attr('long_name', 'Air Temperature Observation Error') \ + .write_data(toboe) + + # Sensible Temperature Observation Error + obsspace.create_var('ObsError/sensibleTemperature', dtype=tsenoe.dtype, fillval=tsenoe.fill_value) \ + .write_attr('units', 'K') \ + .write_attr('long_name', 'Sensible Temperature Observation Error') \ + .write_data(tsenoe) + + # Virtual Temperature Observation Error + obsspace.create_var('ObsError/virtualTemperature', dtype=tvooe.dtype, fillval=tvooe.fill_value) \ + .write_attr('units', 'K') \ + .write_attr('long_name', 'Virtual Temperature Observation Error') \ + .write_data(tvooe) + + # Specific Humidity Observation Error + obsspace.create_var('ObsError/specificHumidity', dtype=qoboe.dtype, fillval=qoboe.fill_value) \ + .write_attr('long_name', 'Specific Humidity Observation Error') \ + .write_data(qoboe) + + # Eastward Wind Observation Error + obsspace.create_var('ObsError/windEastward', dtype=uoboe.dtype, fillval=uoboe.fill_value) \ + .write_attr('units', 'm s-1') \ + .write_attr('long_name', 'Eastward Wind Observation Error') \ + .write_data(uoboe) + + # Northward Wind Observation Error + obsspace.create_var('ObsError/windNorthward', dtype=voboe.dtype, fillval=voboe.fill_value) \ + .write_attr('units', 'm s-1') \ + .write_attr('long_name', 'Northward Wind Observation Error') \ + .write_data(voboe) + end_time = time.time() running_time = end_time - start_time logger.info(f"Running time for splitting and output IODA: {running_time} seconds") From 4d8923a5847e3a9a3c6fed17a2a64a06e712462d Mon Sep 17 00:00:00 2001 From: Jiarui Dong Date: Mon, 22 Jan 2024 16:09:24 -0500 Subject: [PATCH 92/94] Make changes to include 'OCNRES' in the orography filenames. (#864) This PR is to address the recent filename changes of the orography data from `$(CASE)_oro_data.nc` to `$(CASE).mx$(OCNRES)_oro_data.nc` in the global-workflow. This PR is a prerequisite to support https://github.com/NOAA-EMC/global-workflow/pull/2232. --- parm/land/letkfoi/apply_incr_nml.j2 | 2 +- parm/land/letkfoi/letkfoi.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parm/land/letkfoi/apply_incr_nml.j2 b/parm/land/letkfoi/apply_incr_nml.j2 index 39765a5d3..d12b00150 100644 --- a/parm/land/letkfoi/apply_incr_nml.j2 +++ b/parm/land/letkfoi/apply_incr_nml.j2 @@ -6,5 +6,5 @@ rst_path = "{{ DATA }}/anl", inc_path = "{{ DATA }}/anl", orog_path = "{{ HOMEgfs }}/fix/orog/{{ CASE }}", - otype = "{{ CASE }}_oro_data" + otype = "{{ CASE }}.mx{{ OCNRES }}_oro_data" / diff --git a/parm/land/letkfoi/letkfoi.yaml b/parm/land/letkfoi/letkfoi.yaml index da2540852..26ee0e009 100644 --- a/parm/land/letkfoi/letkfoi.yaml +++ b/parm/land/letkfoi/letkfoi.yaml @@ -17,7 +17,7 @@ geometry: skip coupler file: true state variables: [orog_filt] datapath: $(FIXgfs)/orog/${CASE}/ - filename_orog: $(CASE)_oro_data.nc + filename_orog: $(CASE).mx$(OCNRES)_oro_data.nc time window: begin: '{{ LAND_WINDOW_BEGIN | to_isotime }}' From 839e8a203734b352bed21229ab61a96b591815a9 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA <26926959+RussTreadon-NOAA@users.noreply.github.com> Date: Tue, 23 Jan 2024 12:50:48 -0500 Subject: [PATCH 93/94] update resdet and resens keywords in prototypes (#867) This PR replaces `--resdet` and `--resens` with `--resdetatmos` and `--resensatmos`, respectively, in order to restore the functionality of automated GDASApp tests which exercise g-w. Resolves #866 --- prototypes/configs/cp0.sh | 4 ++-- prototypes/gen_prototype.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/prototypes/configs/cp0.sh b/prototypes/configs/cp0.sh index 257ed5f7a..e91d22240 100644 --- a/prototypes/configs/cp0.sh +++ b/prototypes/configs/cp0.sh @@ -14,8 +14,8 @@ edate=2021080118 app="ATM" starttype="cold" gfscyc=0 -resdet=96 -resens=96 +resdetatmos=96 +resensatmos=96 nens=0 # config.* options DO_JEDIATMVAR="YES" diff --git a/prototypes/gen_prototype.sh b/prototypes/gen_prototype.sh index d58492e4b..ee531e922 100755 --- a/prototypes/gen_prototype.sh +++ b/prototypes/gen_prototype.sh @@ -89,8 +89,8 @@ cd $GWDIR/global-workflow/workflow --app $app \ --start $starttype \ --gfs_cyc $gfscyc \ - --resdet $resdet \ - --resens $resens \ + --resdetatmos $resdetatmos \ + --resensatmos $resensatmos \ --nens $nens \ --pslot $PSLOT \ --configdir $GWDIR/global-workflow/parm/config/gfs \ From a2bbb906939bbcd189e29fd7cc97a7fb4406a018 Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Wed, 24 Jan 2024 17:07:15 +0000 Subject: [PATCH 94/94] Update hera modulefile for spack-stack/1.6.0. --- modulefiles/GDAS/hera.lua | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/modulefiles/GDAS/hera.lua b/modulefiles/GDAS/hera.lua index e1014f92d..252127613 100644 --- a/modulefiles/GDAS/hera.lua +++ b/modulefiles/GDAS/hera.lua @@ -6,7 +6,7 @@ local pkgName = myModuleName() local pkgVersion = myModuleVersion() local pkgNameVer = myModuleFullName() -prepend_path("MODULEPATH", '/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core') +prepend_path("MODULEPATH", '/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core') prepend_path("MODULEPATH", '/scratch1/NCEPDEV/da/python/opt/modulefiles/stack') -- below two lines get us access to the spack-stack modules @@ -15,40 +15,40 @@ load("stack-intel-oneapi-mpi/2021.5.1") -- JCSDA has 'jedi-fv3-env/unified-dev', but we should load these manually as needed load("cmake/3.23.1") load("gettext/0.19.8.1") -load("libunistring/1.1") -load("libidn2/2.3.4") +--load("libunistring/1.1") +--load("libidn2/2.3.4") load("pcre2/10.42") -load("curl/7.29.0") +load("curl/8.4.0") load("zlib/1.2.13") -load("git/2.40.0") +load("git/2.18.0") load("pkg-config/0.27.1") load("hdf5/1.14.0") load("parallel-netcdf/1.12.2") load("netcdf-c/4.9.2") load("nccmp/1.9.0.1") -load("netcdf-fortran/4.6.0") +load("netcdf-fortran/4.6.1") load("nco/5.0.6") load("parallelio/2.5.10") load("wget/1.14") -load("boost/1.78.0") +load("boost/1.83.0") load("bufr/12.0.1") load("git-lfs/2.10.0") load("ecbuild/3.7.2") load("openjpeg/2.3.1") -load("eccodes/2.27.0") +load("eccodes/2.32.0") load("eigen/3.4.0") -load("openblas/0.3.19") -load("eckit/1.24.4") +load("openblas/0.3.24") +load("eckit/1.24.5") load("fftw/3.3.10") load("fckit/0.11.0") load("fiat/1.2.0") load("ectrans/1.2.0") -load("atlas/0.35.0") -load("sp/2.3.3") +load("atlas/0.35.1") +load("sp/2.5.0") load("gsl-lite/0.37.0") load("libjpeg/2.1.0") load("krb5/1.15.1") -load("libtirpc/1.2.6") +load("libtirpc/1.3.3") load("hdf/4.2.15") load("jedi-cmake/1.4.0") load("libpng/1.6.37") @@ -57,16 +57,16 @@ load("libxmu/1.1.4") load("libxpm/4.11.0") load("libxaw/1.0.13") load("udunits/2.2.28") -load("ncview/2.1.8") +load("ncview/2.1.9") load("netcdf-cxx4/4.3.1") load("json/3.10.5") -load("py-pybind11/2.8.1") +load("py-pybind11/2.11.0") --load("crtm/v2.4_jedi") load("rocoto/1.3.3") load("hpc/1.2.0") -unload("python/3.10.8") -unload("python/3.9.2") +unload("python/3.10.13") +unload("py-numpy/1.22.3") load("miniconda3/4.6.14") load("gdasapp/1.0.0") @@ -79,7 +79,6 @@ local mpinproc = '-n' setenv('MPIEXEC_EXEC', mpiexec) setenv('MPIEXEC_NPROC', mpinproc) -setenv('R2D2_CONFIG', '/scratch1/NCEPDEV/stmp4/Cory.R.Martin/R2D2_SHARED/config_hera.yaml') setenv("CRTM_FIX","/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix/crtm/2.4.0") setenv("GDASAPP_TESTDATA","/scratch1/NCEPDEV/da/Cory.R.Martin/CI/GDASApp/data") prepend_path("PATH","/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-18.0.5.274/prod_util/1.2.2/bin")