From 69d07725f9700db5793a9bbd0f86b8ae21fdf862 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Fri, 5 Mar 2021 15:19:07 -0600 Subject: [PATCH 1/7] changed .gitmodules to point to merra2 ccpp/physics --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- gfsphysics/physics/aerclm_def.f | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..a26b924da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,7 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = master + #url = https://github.com/NCAR/ccpp-physics + #branch = master + url = https://github.com/AnningCheng-NOAA/ccpp-physics + branch = merra2 diff --git a/ccpp/physics b/ccpp/physics index 8ef88ca46..79ae254af 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8ef88ca46c11535fc7984d39ec38d1582f9db5ff +Subproject commit 79ae254afab6f9d1dd22004fed1f6123480ebfff diff --git a/gfsphysics/physics/aerclm_def.f b/gfsphysics/physics/aerclm_def.f index 84852a1de..b5e3682a0 100644 --- a/gfsphysics/physics/aerclm_def.f +++ b/gfsphysics/physics/aerclm_def.f @@ -2,7 +2,7 @@ module aerclm_def use machine , only : kind_phys implicit none - integer, parameter :: levsaer=50, ntrcaerm=15, timeaer=12 + integer, parameter :: levsaer=72, ntrcaerm=15, timeaer=12 integer :: latsaer, lonsaer, ntrcaer character*10 :: specname(ntrcaerm) From 30051d59f7ce5e410e2d689777c771470c2905cb Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Tue, 16 Mar 2021 08:39:57 -0500 Subject: [PATCH 2/7] remove GFDL_atmos_cubed_sphere and ccpp-framework from .git module --- .gitmodules | 8 -------- atmos_cubed_sphere | 2 +- ccpp/framework | 2 +- ccpp/physics | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index a26b924da..6190936d1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,3 @@ -[submodule "atmos_cubed_sphere"] - path = atmos_cubed_sphere - url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere - branch = dev/emc -[submodule "ccpp/framework"] - path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = master [submodule "ccpp/physics"] path = ccpp/physics #url = https://github.com/NCAR/ccpp-physics diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 61875852b..306ff3137 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 61875852b52951f6c6215603a19c826b952fc534 +Subproject commit 306ff31371e74694e5d9f4a57584295c7122b9ac diff --git a/ccpp/framework b/ccpp/framework index dca1240e6..612dd1aa9 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit dca1240e6f19a5bbcfa0b14aa8526f36e99ed135 +Subproject commit 612dd1aa9ed6f8c08b4c280ba1c992dd5357fc59 diff --git a/ccpp/physics b/ccpp/physics index 958aaae61..b55e3827b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 958aaae6172a16ca27918dc109233f32c56d3353 +Subproject commit b55e3827beb90625839ef323891f9cd7db1e741d From dbc9d708217605ec438d3d4128ebef3a75b10b5b Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Tue, 16 Mar 2021 09:13:46 -0500 Subject: [PATCH 3/7] remove IPD gfsphysics --- gfsphysics/physics/aerclm_def.f | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 gfsphysics/physics/aerclm_def.f diff --git a/gfsphysics/physics/aerclm_def.f b/gfsphysics/physics/aerclm_def.f deleted file mode 100644 index b5e3682a0..000000000 --- a/gfsphysics/physics/aerclm_def.f +++ /dev/null @@ -1,23 +0,0 @@ - module aerclm_def - use machine , only : kind_phys - implicit none - - integer, parameter :: levsaer=72, ntrcaerm=15, timeaer=12 - integer :: latsaer, lonsaer, ntrcaer - - character*10 :: specname(ntrcaerm) - real (kind=kind_phys):: aer_time(13) - - real (kind=kind_phys), allocatable, dimension(:) :: aer_lat - real (kind=kind_phys), allocatable, dimension(:) :: aer_lon - real (kind=kind_phys), allocatable, dimension(:,:,:,:) :: aer_pres - real (kind=kind_phys), allocatable, dimension(:,:,:,:,:) :: aerin - - data aer_time/15.5, 45., 74.5, 105., 135.5, 166., 196.5, - & 227.5, 258., 288.5, 319., 349.5, 380.5/ - - data specname /'DU001','DU002','DU003','DU004','DU005', - & 'SS001','SS002','SS003','SS004','SS005','SO4', - & 'BCPHOBIC','BCPHILIC','OCPHOBIC','OCPHILIC'/ - - end module aerclm_def From 1b633bfb1c16ab0c89b622d5bb6c6420f9d2a6ac Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Tue, 16 Mar 2021 09:35:45 -0500 Subject: [PATCH 4/7] .gitmodules update --- .gitmodules | 8 ++++++++ ccpp/physics | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6190936d1..e3a358642 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,11 @@ +[submodule "atmos_cubed_sphere"] + path = atmos_cubed_sphere + url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere + branch = dev/emc +[submodule "ccpp/framework"] + path = ccpp/framework + url = https://github.com/NCAR/ccpp-framework + branch = master [submodule "ccpp/physics"] path = ccpp/physics #url = https://github.com/NCAR/ccpp-physics diff --git a/ccpp/physics b/ccpp/physics index b55e3827b..f34b1b029 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit b55e3827beb90625839ef323891f9cd7db1e741d +Subproject commit f34b1b0292b75a39a7452d1536f7d8646c6ed782 From 99eddab1f6c3737bdae14735dc9e53b25a11e536 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 1 Apr 2021 20:11:10 -0600 Subject: [PATCH 5/7] Update .gitmodules and submodule pointer fpor ccpp-physics for code review and testing --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index e3a358642..281ed1cf8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,5 +10,5 @@ path = ccpp/physics #url = https://github.com/NCAR/ccpp-physics #branch = master - url = https://github.com/AnningCheng-NOAA/ccpp-physics - branch = merra2 + url = https://github.com/climbfuji/ccpp-physics + branch = threading_aerosol_interp_noahmp_init diff --git a/ccpp/physics b/ccpp/physics index f34b1b029..15575af98 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit f34b1b0292b75a39a7452d1536f7d8646c6ed782 +Subproject commit 15575af9802e274d915874418ee3a253eae77e9b From 927dc2120c8ce7df7626aa1d1c0cc04278456ff4 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 2 Apr 2021 10:15:03 -0600 Subject: [PATCH 6/7] Update submodule pointer for ccpp-physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 15575af98..347104a52 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 15575af9802e274d915874418ee3a253eae77e9b +Subproject commit 347104a52e127afd014965e54d28e052d3c9ac30 From 91df56743c665cd3dc1de5b7b822d8bf59b7c911 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 9 Apr 2021 08:34:58 -0600 Subject: [PATCH 7/7] update submodule pointer for ccpp-physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 222ffe678..6b997420d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 222ffe678e4562e9fdc46665da86a2156c07034f +Subproject commit 6b997420d4f40a29e2b4c40db9429a62b52dcfc5