From 50c50f6453df6f304c44afa6b50d9f55666b2a53 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Fri, 26 Apr 2024 15:42:53 +0000 Subject: [PATCH 01/12] Initial commit --- atmos_model.F90 | 4 ++-- ccpp/data/GFS_typedefs.F90 | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/atmos_model.F90 b/atmos_model.F90 index a2ca32a75..4d640e619 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -405,7 +405,7 @@ subroutine update_atmos_radiation_physics (Atmos) if (mpp_pe() == mpp_root_pe()) print *,'PHYSICS STEP2 ', GFS_control%kdt, GFS_control%fhour call fv3atm_checksum(GFS_control, GFS_data, Atm_block) endif - call getiauforcing(GFS_control,IAU_data) + call getiauforcing(GFS_control,IAU_data,Atm(mygrid)) if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "end of radiation and physics step" !--- execute the atmospheric timestep finalize step @@ -722,7 +722,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step) Atm(mygrid)%flagstruct%do_skeb = GFS_control%do_skeb ! initialize the IAU module - call iau_initialize (GFS_control,IAU_data,Init_parm) + call iau_initialize (GFS_control,IAU_data,Init_parm,Atm(mygrid)) Init_parm%blksz => null() Init_parm%ak => null() diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 07eecbe20..e0d9c6674 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1598,6 +1598,9 @@ module GFS_typedefs real(kind=kind_phys), pointer :: si(:) !< vertical sigma coordinate for model initialization real(kind=kind_phys) :: sec !< seconds since model initialization +!--- Increment grid + logical :: gaussian_increment ! increment on guassian grid or else native grid + !--- IAU integer :: iau_offset real(kind=kind_phys) :: iau_delthrs ! iau time interval (to scale increments) in hours @@ -3884,6 +3887,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & logical :: ca_entr = .false. logical :: ca_trigger = .false. +!--- Increment grid + logical :: gaussian_increment = .true. ! increment on guassian grid or else native grid + !--- IAU options real(kind=kind_phys) :: iau_delthrs = 0 !< iau time interval (to scale increments) character(len=240) :: iau_inc_files(7) = '' !< list of increment files @@ -4102,6 +4108,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & nseed, nseed_g, nthresh, do_ca, ca_advect, & ca_sgs, ca_global,iseed_ca,ca_smooth, & nspinup,ca_amplitude,nsmooth,ca_closure,ca_entr,ca_trigger, & + !--- Increment grid + gaussian_increment, & !--- IAU iau_delthrs,iaufhrs,iau_inc_files,iau_filter_increments, & iau_drymassfixer, & From 29bcf40421da037818df550e5546b8afdcc0f730 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Tue, 14 May 2024 20:06:23 +0000 Subject: [PATCH 02/12] Change name of namelist parameter --- ccpp/data/GFS_typedefs.F90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index e0d9c6674..31dfdde69 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1599,7 +1599,7 @@ module GFS_typedefs real(kind=kind_phys) :: sec !< seconds since model initialization !--- Increment grid - logical :: gaussian_increment ! increment on guassian grid or else native grid + logical :: increment_file_on_native_grid ! increment on native grid else Gaussian grid !--- IAU integer :: iau_offset @@ -3888,7 +3888,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & logical :: ca_trigger = .false. !--- Increment grid - logical :: gaussian_increment = .true. ! increment on guassian grid or else native grid + logical :: increment_file_on_native_grid = .false. ! increment on native grid else Gaussian grid !--- IAU options real(kind=kind_phys) :: iau_delthrs = 0 !< iau time interval (to scale increments) @@ -4109,7 +4109,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & ca_sgs, ca_global,iseed_ca,ca_smooth, & nspinup,ca_amplitude,nsmooth,ca_closure,ca_entr,ca_trigger, & !--- Increment grid - gaussian_increment, & + increment_file_on_native_grid, & !--- IAU iau_delthrs,iaufhrs,iau_inc_files,iau_filter_increments, & iau_drymassfixer, & From 80b09880ac43294a4f2e56f8e632c417123729fe Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 30 May 2024 13:15:12 +0000 Subject: [PATCH 03/12] Update atmos_cubed_sphere hash --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 061a73663..953d582e9 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 061a73663f2bab9799eab7345c2ff8a34c789573 +Subproject commit 953d582e914e9cbc1190b4597a4245d055bab041 From 435e2094ea1c0ea1d49dc4b2dfa379370d8ca5f9 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 30 May 2024 16:45:36 +0000 Subject: [PATCH 04/12] Update atmos_cubed_sphere hash --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 953d582e9..c9be39460 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 953d582e914e9cbc1190b4597a4245d055bab041 +Subproject commit c9be39460689673f6dfd578d4561355e5affae35 From 67835ec1753c66a18de6dfe91eac65fd7b5ac409 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Mon, 15 Jul 2024 17:32:49 +0000 Subject: [PATCH 05/12] Update hash --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 2ccb113ed..3865ccc07 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 2ccb113ed87513aec891e9ce1567c34bcb13253e +Subproject commit 3865ccc0770b1f5c72ab4965a0b21faa6acd3795 From 06ef6fc591b7ccd106f93a9f0a541747a0e3c08e Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Tue, 30 Jul 2024 19:08:56 +0000 Subject: [PATCH 06/12] Update atmos_cubed_sphere hash --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index c257cd2b9..409eca8ea 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit c257cd2b9ba024b389b07bbdd182fd7ed859e469 +Subproject commit 409eca8ea893fa6fbc5937c612a30df38d8f2437 From 13e6733362515357ac0ec6b6daa575eebcfe22ee Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 8 Aug 2024 13:02:13 +0000 Subject: [PATCH 07/12] Update atmos_cubed_sphere hash --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 409eca8ea..cdc230d7f 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 409eca8ea893fa6fbc5937c612a30df38d8f2437 +Subproject commit cdc230d7fbbe18b0b5711ed982288bdc6aebbf25 From 7634b7ad4aa21bbaf435620602c539abe7a6b753 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 8 Aug 2024 14:44:38 +0000 Subject: [PATCH 08/12] Set .gitmodules --- .gitmodules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..7e9fb58f4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - branch = dev/emc +# url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere +# branch = dev/emc + url = https://github.com/DavidNew-NOAA/GFDL_atmos_cubed_sphere/ + branch = feature/cubed_sphere_inc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework From 2b2aaf99363ec5baec6e52724c5c6523ea1a9e85 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Fri, 9 Aug 2024 17:13:25 +0000 Subject: [PATCH 09/12] Update atmos_cubed_sphere hash --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index cdc230d7f..7c3102fcc 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit cdc230d7fbbe18b0b5711ed982288bdc6aebbf25 +Subproject commit 7c3102fccc493d4c006c936ea88e4b512f6f5251 From a3d8fe04e62d98b9cad35ebe4f423c2c73430f79 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Fri, 9 Aug 2024 17:17:44 +0000 Subject: [PATCH 10/12] Update hash --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 7c3102fcc..cdc230d7f 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 7c3102fccc493d4c006c936ea88e4b512f6f5251 +Subproject commit cdc230d7fbbe18b0b5711ed982288bdc6aebbf25 From 40fa2b517f4502728d37c85ebfd2d8762fb40a4a Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 15 Aug 2024 13:43:04 +0000 Subject: [PATCH 11/12] Update hash --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 67b411c44..04b336f3d 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 67b411c44356b5f78769f0406743297e8366f345 +Subproject commit 04b336f3da7fde10f1c63ca82699fd5c1378fbf3 From 44ca9358d10669cd6eaa68fb779d7532c13b1df1 Mon Sep 17 00:00:00 2001 From: Jong Kim Date: Tue, 27 Aug 2024 13:24:26 +0000 Subject: [PATCH 12/12] hash update and revert change in gitmodules: acs --- .gitmodules | 6 ++---- atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7e9fb58f4..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere -# url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere -# branch = dev/emc - url = https://github.com/DavidNew-NOAA/GFDL_atmos_cubed_sphere/ - branch = feature/cubed_sphere_inc + url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 04b336f3d..ac3055eff 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 04b336f3da7fde10f1c63ca82699fd5c1378fbf3 +Subproject commit ac3055eff06099d61cd65e18bc4f0353ffd83f46