From ee6fb51197ef8335bab80e1e6404ae7dcd0535dc Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Fri, 6 May 2022 20:43:28 +0000 Subject: [PATCH 1/6] Changes to ccpp to support 32-bit physics in NRL Neptune model --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..8415920d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/SamuelTrahaNOAA/ccpp-physics + branch = ccpp-neptune [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 3405ff171..63020ec6a 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3405ff171d7fa55d6aa7fb45b316146516c6e3ca +Subproject commit 63020ec6a737511a46102865458b9843e340a404 From ea8f82b91d1939176148786c7776a74ab55a64f7 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Fri, 6 May 2022 20:51:38 +0000 Subject: [PATCH 2/6] Fix typo in .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 8415920d7..1f64d356f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/SamuelTrahaNOAA/ccpp-physics + url = ssh://git@github.com/SamuelTrahanNOAA/ccpp-physics branch = ccpp-neptune [submodule "upp"] path = upp From b42a58fc1f89b7c8905d4fbabf3846db923c4fd4 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 24 May 2022 17:12:33 +0000 Subject: [PATCH 3/6] change ssh -> https --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 1f64d356f..b3f6faef5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = ssh://git@github.com/SamuelTrahanNOAA/ccpp-physics + url = https://github.com/SamuelTrahanNOAA/ccpp-physics branch = ccpp-neptune [submodule "upp"] path = upp From a9a6c419b1317f1d84c469ccd474de4678b20070 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 24 May 2022 18:19:03 +0000 Subject: [PATCH 4/6] ccpp/physics: Simplify machine.F and remove unused types. --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 828f1680c..d4d0b719a 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 828f1680c784fb71bc96288392fce5e59a7dbd98 +Subproject commit d4d0b719ab297741ea484bee00e8285cca423a64 From 5190b1b655222b59320df142f806d25b7a673521 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Wed, 25 May 2022 22:08:54 +0000 Subject: [PATCH 5/6] correct bug in machine.F --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 641544c47..942f9adce 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 641544c47318813ad13337361307921987cb4659 +Subproject commit 942f9adcef364f463158c7e7a097a97b4ddb76f7 From 1ddfaf5decd9389e907bd5878f7eab29bd681b5c Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 26 May 2022 20:40:15 +0000 Subject: [PATCH 6/6] point to ncar main ccpp physics --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index b3f6faef5..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/SamuelTrahanNOAA/ccpp-physics - branch = ccpp-neptune + 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 942f9adce..f13ed4e80 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 942f9adcef364f463158c7e7a097a97b4ddb76f7 +Subproject commit f13ed4e8018859ec4e0aa5da3f36328b826d8b1f