From 33d7b748be08b5605a2af97d591f9d92411a5f7c Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 24 Jan 2024 17:47:53 -0500 Subject: [PATCH 1/3] update ccpp/physics and .gitmodules after testing --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5edd6912e..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR98 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index 8cf9374da..378517c81 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8cf9374da99d7932752173b40c6932e1f52caaac +Subproject commit 378517c81dac9cbe4f0bee41284b46ae070b4323 From baff0ec5926c57fc22813aedc15242dcfea56c87 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 30 Jan 2024 15:15:04 -0500 Subject: [PATCH 2/3] update ccpp/physics and .gitmodules --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index cdb76751f..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR102 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index 8a64c5965..fb0000c3f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8a64c5965ecb99d95558f71c2435d5bbbb77b88b +Subproject commit fb0000c3f255c6f271817f0f6d88e43a29e179a3 From 0b4c7b0de35d79e7754037e2df5597848e56cedd Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 14 Feb 2024 16:03:40 -0500 Subject: [PATCH 3/3] update ccpp/physics submodule and revert .gitmodules --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 647fdaba6..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR122 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index cc2a974fe..23f120a54 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit cc2a974fe7fb17020262d1c4cb7de9b9786c062a +Subproject commit 23f120a54ac1de039a496f249b07532f07cfb38b