From 143c40bdd7a29143e79b4bcc3568dd4322cebb8d Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Wed, 14 Sep 2022 17:50:41 +0000 Subject: [PATCH 1/4] bugfix to save q state regardless of diagnostic flag, submodule update --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..50ea09a68 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main +# url = https://github.com/NCAR/ccpp-physics +# branch = main + url = https://github.com/lisa-bengtsson/ccpp-physics + branch = prog_bugfix [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 7b02d419c..475e63f97 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7b02d419cf8d2319576d1fd37ee48a7e92409739 +Subproject commit 475e63f97dbaaff5f2135ab4e7ed80e60d6ccf9b From 1648b3b927873ac5463405a8cee3548d1db2a726 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Wed, 14 Sep 2022 18:12:41 +0000 Subject: [PATCH 2/4] optimizing massflux at cloud base based on P8 simulations, submodule update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 475e63f97..7c8a9b081 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 475e63f97dbaaff5f2135ab4e7ed80e60d6ccf9b +Subproject commit 7c8a9b081e222d39595711ff4d75780511e92e3e From 817bfd0fbf1966f5149df35128f18ad80fae2c38 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Thu, 15 Sep 2022 20:15:23 +0000 Subject: [PATCH 3/4] typo in ccpp/physics submodule --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 7c8a9b081..4e63a7741 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7c8a9b081e222d39595711ff4d75780511e92e3e +Subproject commit 4e63a7741fae9647e627977af78a94061f624c0a From 9ae2cdc4ff318afe711645b8dc064d5625ce4bd0 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Wed, 28 Sep 2022 17:17:05 +0000 Subject: [PATCH 4/4] update to NCAR main after merge --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 50ea09a68..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics -# url = https://github.com/NCAR/ccpp-physics -# branch = main - url = https://github.com/lisa-bengtsson/ccpp-physics - branch = prog_bugfix + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 4e63a7741..1c70416fb 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4e63a7741fae9647e627977af78a94061f624c0a +Subproject commit 1c70416fb725c6e14e0e4d1f0ed93b1940200746