From 7756f3ae538463a7fcf11d47ae5a0eeba9433ed9 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Fri, 24 Apr 2026 21:39:45 -0600 Subject: [PATCH 1/9] skip the workaround --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index ec34647d..22db1760 100755 --- a/build.sh +++ b/build.sh @@ -263,7 +263,7 @@ if [[ $BUILD_RRFS_TEST == 'YES' ]]; then fi # Copy workaround codes (remove these as soon as PRs are merged) -if [[ $BUILD_WORKAROUND == 'YES' ]]; then +if [[ $BUILD_WORKAROUND == 'COPY_WORKAROUND' ]]; then # Apply workaround patches (git commit-base workaround method) # Need to convert all the copy-based workaround methods to commit-based method From b06489064798d52eb2fb76d15683cc3111c7a675 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Fri, 24 Apr 2026 21:42:38 -0600 Subject: [PATCH 2/9] temporarily use forks for the GSIbec, saber, ufo, mpas-jedi submodules --- .gitmodules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 201bd602..135dac6d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,7 +25,7 @@ ignore = all [submodule "sorc/gsibec"] path = sorc/gsibec - url = https://github.com/GEOS-ESM/GSIbec + url = https://github.com/RRFSx/GSIbec branch = develop ignore = all [submodule "sorc/ioda"] @@ -50,12 +50,12 @@ ignore = all [submodule "sorc/saber"] path = sorc/saber - url = https://github.com/jcsda/saber + url = https://github.com/RRFSx/saber branch = develop ignore = all [submodule "sorc/ufo"] path = sorc/ufo - url = https://github.com/jcsda/ufo + url = https://github.com/RRFSx/ufo branch = develop ignore = all [submodule "sorc/vader"] @@ -70,7 +70,7 @@ ignore = all [submodule "sorc/mpas-jedi"] path = sorc/mpas-jedi - url = https://github.com/JCSDA/mpas-jedi + url = https://github.com/RRFSx/mpas-jedi branch = develop ignore = all [submodule "sorc/bufr-query"] From 52305355c20f6760f042420f8a3be08928f6b985 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Fri, 24 Apr 2026 21:45:14 -0600 Subject: [PATCH 3/9] gsibec: handle missing values in compute_qvar3d.F90, gsi_convert_cv_mod.f90 and normal_rh_to_q.f90 --- sorc/gsibec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gsibec b/sorc/gsibec index d68bb23d..379cd7d0 160000 --- a/sorc/gsibec +++ b/sorc/gsibec @@ -1 +1 @@ -Subproject commit d68bb23d885a40492cc5a4435973fb014f07f883 +Subproject commit 379cd7d0729d344e8a5679da99c6faf32e9b8d1e From 7d508b5759cfc291fa6d912c357c0fc0887783d8 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Fri, 24 Apr 2026 21:46:54 -0600 Subject: [PATCH 4/9] saber: use GSIbec for regional fv3jedi and mpasjedi analysis --- sorc/saber | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/saber b/sorc/saber index d36b8903..73c92175 160000 --- a/sorc/saber +++ b/sorc/saber @@ -1 +1 @@ -Subproject commit d36b8903e1421b21062830a787577dc5301173dc +Subproject commit 73c921757f58130470e529ac4d59560b708a35f7 From 53a138d20889f9d436899ccbb768a8574cd59d18 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Fri, 24 Apr 2026 21:48:34 -0600 Subject: [PATCH 5/9] ufo: change surface operator name from airTemperatureAt2M to airTemperature --- sorc/ufo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufo b/sorc/ufo index af04d3de..5fcb229e 160000 --- a/sorc/ufo +++ b/sorc/ufo @@ -1 +1 @@ -Subproject commit af04d3de45509228096771ffa6c8532db46628d4 +Subproject commit 5fcb229e4006210ddd8938fd2eafa4825204c03d From 9289fa072ab1fb161cd2cd180b755c35685c91ef Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Fri, 24 Apr 2026 23:40:48 -0600 Subject: [PATCH 6/9] mpas-jedi: update 2mTQ between outer loops --- sorc/mpas-jedi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/mpas-jedi b/sorc/mpas-jedi index 599ee731..6e049f04 160000 --- a/sorc/mpas-jedi +++ b/sorc/mpas-jedi @@ -1 +1 @@ -Subproject commit 599ee731feb559fa5499bff94e0b58c89a3aec8c +Subproject commit 6e049f045d352c809a83f735ab04fe0170cbd918 From 412d73b9bbfc0814cbc57d9dbac675c2409ca67c Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Sat, 25 Apr 2026 10:29:34 -0600 Subject: [PATCH 7/9] gsibec: change the base to d68bb23 (04/01/2026) to match NOAA-EMC/RDASApp --- sorc/gsibec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gsibec b/sorc/gsibec index 379cd7d0..7b6da879 160000 --- a/sorc/gsibec +++ b/sorc/gsibec @@ -1 +1 @@ -Subproject commit 379cd7d0729d344e8a5679da99c6faf32e9b8d1e +Subproject commit 7b6da879c1ba18939b5bd36c5ff150e871855616 From ee032a2cc860d89d9779df02e8fc6ac9b6be5bb4 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Mon, 27 Apr 2026 14:34:14 -0600 Subject: [PATCH 8/9] ufo: include GSL surface DA for t, q, uv --- sorc/ufo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufo b/sorc/ufo index 5fcb229e..bea091d4 160000 --- a/sorc/ufo +++ b/sorc/ufo @@ -1 +1 @@ -Subproject commit 5fcb229e4006210ddd8938fd2eafa4825204c03d +Subproject commit bea091d48d1899b511259f84bab79723b3fe520f From 8d3609de3f3d3031f12921b71bcd779d17247676 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Mon, 27 Apr 2026 16:35:50 -0600 Subject: [PATCH 9/9] mpas-jedi: based on 599ee73, update 2mTQ between outer loops --- sorc/mpas-jedi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/mpas-jedi b/sorc/mpas-jedi index 6e049f04..97e3974d 160000 --- a/sorc/mpas-jedi +++ b/sorc/mpas-jedi @@ -1 +1 @@ -Subproject commit 6e049f045d352c809a83f735ab04fe0170cbd918 +Subproject commit 97e3974d9d5c2b3947d5cb140279d30d63da55e4