From 48ff9c9b99ea87ca9ee724f38a7b1c746f5c0f63 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Fri, 5 Mar 2021 15:18:27 -0600 Subject: [PATCH 1/4] changed .gitmodules to point to merra2 fv3atm --- .gitmodules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6e63f4576f..6107f909e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm - branch = develop + #url = https://github.com/NOAA-EMC/fv3atm + #branch = develop + url = https://github.com/AnningCheng-NOAA/fv3atm + branch = merra2 [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS From 78091c805b1d1a4454fe3e4f354a40d21f6dc2c0 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 1 Apr 2021 20:16:12 -0600 Subject: [PATCH 2/4] Update .gitmodules and submodule pointer for fv3atm for code review and testing --- .gitmodules | 4 ++-- FV3 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 140a91828d..ffeeea6c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,8 +2,8 @@ path = FV3 #url = https://github.com/NOAA-EMC/fv3atm #branch = develop - url = https://github.com/AnningCheng-NOAA/fv3atm - branch = merra2 + url = https://github.com/climbfuji/fv3atm + branch = threading_aerosol_interp_noahmp_init [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 579abd47bb..a318f8c4a6 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 579abd47bbdff6d33befae5e473d309a764b0da3 +Subproject commit a318f8c4a670f98222138c13bd0973b4ffdd15f1 From 28a7c93727d46c06647551c6cebb4d5e20737bfa Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 2 Apr 2021 10:15:29 -0600 Subject: [PATCH 3/4] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index a318f8c4a6..927dc2120c 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit a318f8c4a670f98222138c13bd0973b4ffdd15f1 +Subproject commit 927dc2120c8ce7df7626aa1d1c0cc04278456ff4 From ccd25eb48f1aad5d4dcc5eddc99e09bbf74726e7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 9 Apr 2021 08:35:30 -0600 Subject: [PATCH 4/4] update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index b9d743b7bd..91df56743c 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit b9d743b7bd71d5b3674b6984369e1ff7e606f07f +Subproject commit 91df56743c665cd3dc1de5b7b822d8bf59b7c911