From d6b5f11a1f0560482be10015cced46631733a661 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Sun, 18 Sep 2022 22:12:15 +0000 Subject: [PATCH 01/21] fixes and workarounds for uninitialized memory in fv_regional_bc --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 153cd903f..596359946 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 153cd903f8f95a7bc41fb242fe96fd7cdd4c2b64 +Subproject commit 59635994682bb7797e218d860c9a476e3e0ed755 From 30f7e8df8fbd4337c650929d5d0693e3890aa796 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Sun, 18 Sep 2022 22:12:22 +0000 Subject: [PATCH 02/21] initialize kmaxfire in module_bl_mynn --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 7b02d419c..2c1f62b1d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7b02d419cf8d2319576d1fd37ee48a7e92409739 +Subproject commit 2c1f62b1dda7318e2e420e54fd0f7bd775dd8abb From 4380c45d582ff7e41d9fafa85524145ede61e084 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 19 Sep 2022 19:01:29 +0000 Subject: [PATCH 03/21] smoke bug fixes for restart --- ccpp/driver/GFS_restart.F90 | 117 ++++++++++++++++++++++++++++++++++++ ccpp/physics | 2 +- 2 files changed, 118 insertions(+), 1 deletion(-) diff --git a/ccpp/driver/GFS_restart.F90 b/ccpp/driver/GFS_restart.F90 index 4774ff299..b7bff5fa8 100644 --- a/ccpp/driver/GFS_restart.F90 +++ b/ccpp/driver/GFS_restart.F90 @@ -124,6 +124,9 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & if (Model%do_cap_suppress .and. Model%num_dfi_radar>0) then Restart%num2d = Restart%num2d + Model%num_dfi_radar endif + if (Model%rrfs_smoke) then + Restart%num2d = Restart%num2d + 13 + endif Restart%num3d = Model%ntot3d if (Model%num_dfi_radar>0) then @@ -148,6 +151,9 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & if (Model%progsigma) then Restart%num3d = Restart%num3d + 2 endif + if (Model%rrfs_smoke) then + Restart%num3d = Restart%num3d + 8 + endif if (Model%num_dfi_radar > 0) then do itime=1,Model%dfi_radar_max_intervals @@ -419,6 +425,74 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & enddo endif + if (Model%rrfs_smoke) then + num = num+1 + Restart%name2d(num) = 'emdust' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%emdust(:) + enddo + num = num+1 + Restart%name2d(num) = 'emseas' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%emseas(:) + enddo + num = num+1 + Restart%name2d(num) = 'emanoc' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%emanoc(:) + enddo + num = num+1 + Restart%name2d(num) = 'ebb_smoke_hr' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%ebb_smoke_hr(:) + enddo + num = num+1 + Restart%name2d(num) = 'frp_hr' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%frp_hr(:) + enddo + num = num+1 + Restart%name2d(num) = 'frp_std_hr' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%frp_std_hr(:) + enddo + num = num+1 + Restart%name2d(num) = 'fhist' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%fhist(:) + enddo + num = num+1 + Restart%name2d(num) = 'coef_bb_dc' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%coef_bb_dc(:) + enddo + num = num+1 + Restart%name2d(num) = 'min_fplume' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%min_fplume(:) + enddo + num = num+1 + Restart%name2d(num) = 'max_fplume' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%max_fplume(:) + enddo + num = num+1 + Restart%name2d(num) = 'rrfs_hwp' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%rrfs_hwp(:) + enddo + num = num+1 + Restart%name2d(num) = 'ushfsfci' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%ushfsfci(:) + enddo + num = num+1 + Restart%name2d(num) = 'rainc_cpl' + do nb=1,nblks + Restart%data(nb,num)%var2p => Coupling(nb)%rainc_cpl(:) + enddo + endif + !--- phy_f3d variables do num = 1,Model%ntot3d !--- set the variable name @@ -551,6 +625,49 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & enddo endif + if (Model%rrfs_smoke) then + num = num+1 + Restart%name3d(num) = 'ebu_smoke' + do nb=1,nblks + Restart%data(nb,num)%var3p => Coupling(nb)%ebu_smoke(:,:) + enddo + num = num+1 + Restart%name3d(num) = 'smoke_ext' + do nb=1,nblks + Restart%data(nb,num)%var3p => Coupling(nb)%smoke_ext(:,:) + enddo + num = num+1 + Restart%name3d(num) = 'dust_ext' + do nb=1,nblks + Restart%data(nb,num)%var3p => Coupling(nb)%dust_ext(:,:) + enddo + num = num+1 + Restart%name3d(num) = 'dqdti' + do nb=1,nblks + Restart%data(nb,num)%var3p => Coupling(nb)%dqdti(:,:) + enddo + num = num+1 + Restart%name3d(num) = 'chem3d1' + do nb=1,nblks + Restart%data(nb,num)%var3p => Coupling(nb)%chem3d(:,:,1) + enddo + num = num+1 + Restart%name3d(num) = 'chem3d2' + do nb=1,nblks + Restart%data(nb,num)%var3p => Coupling(nb)%chem3d(:,:,2) + enddo + num = num+1 + Restart%name3d(num) = 'pfi_lsan' + do nb=1,nblks + Restart%data(nb,num)%var3p => Coupling(nb)%pfi_lsan(:,:) + enddo + num = num+1 + Restart%name3d(num) = 'pfl_lsan' + do nb=1,nblks + Restart%data(nb,num)%var3p => Coupling(nb)%pfl_lsan(:,:) + enddo + endif + end subroutine GFS_restart_populate end module GFS_restart diff --git a/ccpp/physics b/ccpp/physics index 2c1f62b1d..d02ea2616 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 2c1f62b1dda7318e2e420e54fd0f7bd775dd8abb +Subproject commit d02ea26162119725e55331722db850aeb23350da From 42a5ff940fee47fa0d8fac972a612d4ba5bbd23d Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 20 Sep 2022 11:13:54 +0000 Subject: [PATCH 04/21] remove smoke bug fixes --- ccpp/driver/GFS_restart.F90 | 117 ------------------------------------ ccpp/physics | 2 +- 2 files changed, 1 insertion(+), 118 deletions(-) diff --git a/ccpp/driver/GFS_restart.F90 b/ccpp/driver/GFS_restart.F90 index b7bff5fa8..4774ff299 100644 --- a/ccpp/driver/GFS_restart.F90 +++ b/ccpp/driver/GFS_restart.F90 @@ -124,9 +124,6 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & if (Model%do_cap_suppress .and. Model%num_dfi_radar>0) then Restart%num2d = Restart%num2d + Model%num_dfi_radar endif - if (Model%rrfs_smoke) then - Restart%num2d = Restart%num2d + 13 - endif Restart%num3d = Model%ntot3d if (Model%num_dfi_radar>0) then @@ -151,9 +148,6 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & if (Model%progsigma) then Restart%num3d = Restart%num3d + 2 endif - if (Model%rrfs_smoke) then - Restart%num3d = Restart%num3d + 8 - endif if (Model%num_dfi_radar > 0) then do itime=1,Model%dfi_radar_max_intervals @@ -425,74 +419,6 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & enddo endif - if (Model%rrfs_smoke) then - num = num+1 - Restart%name2d(num) = 'emdust' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%emdust(:) - enddo - num = num+1 - Restart%name2d(num) = 'emseas' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%emseas(:) - enddo - num = num+1 - Restart%name2d(num) = 'emanoc' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%emanoc(:) - enddo - num = num+1 - Restart%name2d(num) = 'ebb_smoke_hr' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%ebb_smoke_hr(:) - enddo - num = num+1 - Restart%name2d(num) = 'frp_hr' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%frp_hr(:) - enddo - num = num+1 - Restart%name2d(num) = 'frp_std_hr' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%frp_std_hr(:) - enddo - num = num+1 - Restart%name2d(num) = 'fhist' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%fhist(:) - enddo - num = num+1 - Restart%name2d(num) = 'coef_bb_dc' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%coef_bb_dc(:) - enddo - num = num+1 - Restart%name2d(num) = 'min_fplume' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%min_fplume(:) - enddo - num = num+1 - Restart%name2d(num) = 'max_fplume' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%max_fplume(:) - enddo - num = num+1 - Restart%name2d(num) = 'rrfs_hwp' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%rrfs_hwp(:) - enddo - num = num+1 - Restart%name2d(num) = 'ushfsfci' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%ushfsfci(:) - enddo - num = num+1 - Restart%name2d(num) = 'rainc_cpl' - do nb=1,nblks - Restart%data(nb,num)%var2p => Coupling(nb)%rainc_cpl(:) - enddo - endif - !--- phy_f3d variables do num = 1,Model%ntot3d !--- set the variable name @@ -625,49 +551,6 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & enddo endif - if (Model%rrfs_smoke) then - num = num+1 - Restart%name3d(num) = 'ebu_smoke' - do nb=1,nblks - Restart%data(nb,num)%var3p => Coupling(nb)%ebu_smoke(:,:) - enddo - num = num+1 - Restart%name3d(num) = 'smoke_ext' - do nb=1,nblks - Restart%data(nb,num)%var3p => Coupling(nb)%smoke_ext(:,:) - enddo - num = num+1 - Restart%name3d(num) = 'dust_ext' - do nb=1,nblks - Restart%data(nb,num)%var3p => Coupling(nb)%dust_ext(:,:) - enddo - num = num+1 - Restart%name3d(num) = 'dqdti' - do nb=1,nblks - Restart%data(nb,num)%var3p => Coupling(nb)%dqdti(:,:) - enddo - num = num+1 - Restart%name3d(num) = 'chem3d1' - do nb=1,nblks - Restart%data(nb,num)%var3p => Coupling(nb)%chem3d(:,:,1) - enddo - num = num+1 - Restart%name3d(num) = 'chem3d2' - do nb=1,nblks - Restart%data(nb,num)%var3p => Coupling(nb)%chem3d(:,:,2) - enddo - num = num+1 - Restart%name3d(num) = 'pfi_lsan' - do nb=1,nblks - Restart%data(nb,num)%var3p => Coupling(nb)%pfi_lsan(:,:) - enddo - num = num+1 - Restart%name3d(num) = 'pfl_lsan' - do nb=1,nblks - Restart%data(nb,num)%var3p => Coupling(nb)%pfl_lsan(:,:) - enddo - endif - end subroutine GFS_restart_populate end module GFS_restart diff --git a/ccpp/physics b/ccpp/physics index d02ea2616..7b02d419c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d02ea26162119725e55331722db850aeb23350da +Subproject commit 7b02d419cf8d2319576d1fd37ee48a7e92409739 From 415e9b2d60e6a18cbb9d3ebd3ac2de1c723f609e Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 20 Sep 2022 12:23:10 +0000 Subject: [PATCH 05/21] remove workarounds and fix remaining known bugs in ps_reg --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 596359946..3766d58ea 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 59635994682bb7797e218d860c9a476e3e0ed755 +Subproject commit 3766d58ea26491b09db56694224b29270abdc6b6 From 2de4ae300eb24e35a83612ce1fb74fd9bf20a8b6 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 20 Sep 2022 15:30:34 +0000 Subject: [PATCH 06/21] a few more surface pressure bug fixes; now the test case runs in debug mode --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 3766d58ea..12c9bd1eb 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 3766d58ea26491b09db56694224b29270abdc6b6 +Subproject commit 12c9bd1eb6386137664c9db49a0ef4eb343fa5b8 From dd39e8bc8686b68e73aa923a2e5604b0b316ee0e Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 20 Sep 2022 17:00:56 +0000 Subject: [PATCH 07/21] bug fixes to my bug fixes --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 12c9bd1eb..73b7e5945 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 12c9bd1eb6386137664c9db49a0ef4eb343fa5b8 +Subproject commit 73b7e5945eb78a44c8fe93e420cf52941e14fc50 From 89261e47583dc4e8f1460331240759b6ded33089 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 20 Sep 2022 20:26:42 +0000 Subject: [PATCH 08/21] update to top of dev/emc atmos_cubed_sphere --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 73b7e5945..6dd393a1e 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 73b7e5945eb78a44c8fe93e420cf52941e14fc50 +Subproject commit 6dd393a1e34c4998daf2e8aae0fbd9f007f50b8a From 72ca702e5c1232b03fb683a665a54f74216f50af Mon Sep 17 00:00:00 2001 From: Samuel Trahan Date: Tue, 20 Sep 2022 20:37:53 +0000 Subject: [PATCH 09/21] update atmos_cubed_sphere to dev/emc --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 73b7e5945..5800359cd 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 73b7e5945eb78a44c8fe93e420cf52941e14fc50 +Subproject commit 5800359cdf88a383650fc8216b00fd8d4ff9b7f7 From b937a042728931bb4ec25a1dd6dbb60089851bee Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 20 Sep 2022 20:51:47 +0000 Subject: [PATCH 10/21] update atmos_cubed_sphere --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 5800359cd..7dce0d7bb 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 5800359cdf88a383650fc8216b00fd8d4ff9b7f7 +Subproject commit 7dce0d7bb25b8b333c6906355a338f7d4ae8e702 From 49771dbaa961db49164e007d7dd77ef1e20bfc1f Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Wed, 21 Sep 2022 14:40:56 +0000 Subject: [PATCH 11/21] workarounds and bug fixes from gnu compiler testing --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 7dce0d7bb..8c6789599 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 7dce0d7bb25b8b333c6906355a338f7d4ae8e702 +Subproject commit 8c67895997b10a1a063f038f26c55d5304b81ec6 From 0d0786de904e0ab5754fcc63f172936defce77d7 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Wed, 21 Sep 2022 17:20:15 +0000 Subject: [PATCH 12/21] more atmos_cubed_sphere fixes and tweaks --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 8c6789599..229dbe5b6 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 8c67895997b10a1a063f038f26c55d5304b81ec6 +Subproject commit 229dbe5b6139733be924c42f9cee2c3520761268 From 59c4f95747b45ad8e4047cf70ef3177da57e4c5b Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Wed, 21 Sep 2022 17:20:56 +0000 Subject: [PATCH 13/21] ccpp/physics: module_sf_ruclsm imprecision workaround for gfortran -DDEBUG=ON --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 7b02d419c..ba43da215 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7b02d419cf8d2319576d1fd37ee48a7e92409739 +Subproject commit ba43da215e197b21bae1715a58ea14713db85a93 From eee170f418458d439b2f8db5d7ee81bca937efc8 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Wed, 21 Sep 2022 18:26:11 +0000 Subject: [PATCH 14/21] atmos_cubed_sphere: simplify comments and explain snan --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 229dbe5b6..b923e9f44 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 229dbe5b6139733be924c42f9cee2c3520761268 +Subproject commit b923e9f442d2fc6037e9ff781aead3855c878a52 From aa7ff80bffbfecc69acfc133fca48cfe26c62626 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 22 Sep 2022 14:21:40 +0000 Subject: [PATCH 15/21] point to sam's atmos cubed sphere and ccpp physics --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..6793c8dab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + url = https://github.com/SamuelTrahanNOAA/GFDL_atmos_cubed_sphere branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework @@ -8,7 +8,7 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics + url = https://github.com/SamuelTrahanNOAA/ccpp-physics branch = main [submodule "upp"] path = upp From 15fb6e21d03cbeabbec800c5cb925bd31955c58a Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 22 Sep 2022 14:22:53 +0000 Subject: [PATCH 16/21] Point to Sam's branches of atmos cubed sphere and ccpp physics --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6793c8dab..3e7641b77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere url = https://github.com/SamuelTrahanNOAA/GFDL_atmos_cubed_sphere - branch = dev/emc + branch = bugfix/rrfs-debug-mode [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework @@ -9,7 +9,7 @@ [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/SamuelTrahanNOAA/ccpp-physics - branch = main + branch = bugfix/rrfs-debug-mode-no-smoke [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 3257d09d7a7724bd42db8437d4709188cfe29d31 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 26 Sep 2022 14:36:50 +0000 Subject: [PATCH 17/21] move sanity checks to lsm_ruc and add "snow on ice" check --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index ba43da215..824d40d2c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit ba43da215e197b21bae1715a58ea14713db85a93 +Subproject commit 824d40d2c5329112c040d9ca766e78e56d0aace1 From 890f7db799a44ed51f788156d1c26b5be36244c8 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 27 Sep 2022 12:51:26 +0000 Subject: [PATCH 18/21] use i-1 & j-1 for two-point averages, when available --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index b923e9f44..68a833fe0 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit b923e9f442d2fc6037e9ff781aead3855c878a52 +Subproject commit 68a833fe0bf502737bda03cf32ba4ee41ba25464 From 29ad78a6c000aa2d40abe4e1d5739e45421acec5 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 3 Oct 2022 19:02:00 +0000 Subject: [PATCH 19/21] Replace many changes with atmos_cubed_sphere PR #220 --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 68a833fe0..9824ef375 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 68a833fe0bf502737bda03cf32ba4ee41ba25464 +Subproject commit 9824ef37504e23f61eda762f9cdce5d01cd1ef2b From fe370698f977af02cf36a43dd0e0de2e3a2c768b Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 11 Oct 2022 22:58:48 +0000 Subject: [PATCH 20/21] merge upstream to ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index cb0af04d7..3f6367934 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit cb0af04d7ba69750dfabf1387734d00cb2d52873 +Subproject commit 3f63679341765e357744e8ec3df1eb7387c70a13 From 31e794c8e095ddd891e953ecc52a40bcb1557925 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 17 Oct 2022 15:01:44 +0000 Subject: [PATCH 21/21] point to community repos --- .gitmodules | 8 ++++---- atmos_cubed_sphere | 2 +- ccpp/physics | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3e7641b77..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/SamuelTrahanNOAA/GFDL_atmos_cubed_sphere - branch = bugfix/rrfs-debug-mode + url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/SamuelTrahanNOAA/ccpp-physics - branch = bugfix/rrfs-debug-mode-no-smoke + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 9824ef375..aa42f6e13 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 9824ef37504e23f61eda762f9cdce5d01cd1ef2b +Subproject commit aa42f6e135839492b0a3b80fc3f2c25d766ad437 diff --git a/ccpp/physics b/ccpp/physics index 3f6367934..ab220bf64 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3f63679341765e357744e8ec3df1eb7387c70a13 +Subproject commit ab220bf6481b05212042c0a3095cb181e4b2ad4a