From 574cfd8f8b8dd6fcf6683c59c04e901f61d8e9ae Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Thu, 20 Jun 2024 19:53:38 +0000 Subject: [PATCH 1/7] Output updraft value of convective cloud condensate in CCPP --- .gitmodules | 3 ++- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..9b8e1c4e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics + #url = https://github.com/ufs-community/ccpp-physics + url = https://github.com/lisa-bengtsson/ccpp-physics branch = ufs/dev [submodule "upp"] path = upp diff --git a/ccpp/physics b/ccpp/physics index 16a1d8817..04074884c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 16a1d881774d795f46db16017aeed7fc351d661a +Subproject commit 04074884c04139ecc86d02f0123a0aa2f5a8ccb1 From 0a8bfc7057838abc20ceb3d4322f75ebfbfb08f9 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Tue, 25 Jun 2024 18:09:52 +0000 Subject: [PATCH 2/7] update xkinv1 to 0.15 --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 04074884c..b73269fcd 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 04074884c04139ecc86d02f0123a0aa2f5a8ccb1 +Subproject commit b73269fcd3660b5c69cc110f796ef4a4b4e227be From c2afb53b326ae30913706e3fc04f78ee8b2c973f Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Tue, 25 Jun 2024 21:04:24 +0000 Subject: [PATCH 3/7] add check if progsigma is true --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index b73269fcd..891959c26 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit b73269fcd3660b5c69cc110f796ef4a4b4e227be +Subproject commit 891959c2680b91ba745e4edbd7a7c98e17101d12 From 377318caccd31056e2a3bfdf6a825c1349ade385 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Mon, 15 Jul 2024 14:19:26 +0000 Subject: [PATCH 4/7] Update submodule pointer to ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 891959c26..4f17e7283 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 891959c2680b91ba745e4edbd7a7c98e17101d12 +Subproject commit 4f17e7283c4fb209566d984bbfcb5667cd86cd78 From 2a4071ea5e22aa6d3001f0172a4f7ca9b5f58b8d Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Tue, 16 Jul 2024 16:22:02 +0000 Subject: [PATCH 5/7] address seg fault if progsigma=F --- atmos_cubed_sphere | 2 +- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 523f5a3ea..577fd5e48 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 523f5a3ea2123bc713804aaf347da64b004afb9d +Subproject commit 577fd5e487bb01d20cc44c84741f5b1d24e9c4ab diff --git a/ccpp/framework b/ccpp/framework index 0f8232724..ccfefcd0b 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 0f8232724975c13289cad390c9a71fa2c6a9bff4 +Subproject commit ccfefcd0b426e011f94137031d5f7c2a4dda2659 diff --git a/ccpp/physics b/ccpp/physics index 4f17e7283..1e9b0dd6c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4f17e7283c4fb209566d984bbfcb5667cd86cd78 +Subproject commit 1e9b0dd6c9c9da577349e02c1bb6fc912d29ceba From a8e7a4c547bcb0bde8d1a5a9321920e23d63d848 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Tue, 16 Jul 2024 16:33:10 +0000 Subject: [PATCH 6/7] update submodule pointer to ccpp/framework --- ccpp/framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/framework b/ccpp/framework index ccfefcd0b..0f8232724 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit ccfefcd0b426e011f94137031d5f7c2a4dda2659 +Subproject commit 0f8232724975c13289cad390c9a71fa2c6a9bff4 From fecb89d7ee2ea5c97f04b37d6d3ced6bcc249328 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 19 Jul 2024 15:00:16 -0400 Subject: [PATCH 7/7] update .gitmodules and ccpp/physics after testing --- .gitmodules | 3 +-- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9b8e1c4e4..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,7 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/ufs-community/ccpp-physics - url = https://github.com/lisa-bengtsson/ccpp-physics + url = https://github.com/ufs-community/ccpp-physics branch = ufs/dev [submodule "upp"] path = upp diff --git a/ccpp/physics b/ccpp/physics index 1e9b0dd6c..46df08008 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 1e9b0dd6c9c9da577349e02c1bb6fc912d29ceba +Subproject commit 46df080086fe351f4a96eef5cd82f56af56bf531