From 81ae030348d3420af7e456a695f0964a512d2eaa Mon Sep 17 00:00:00 2001 From: tsga Date: Wed, 4 Sep 2024 04:07:34 +0000 Subject: [PATCH 01/35] update driver for land IAU --- ccpp/driver/CCPP_driver.F90 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index b931998f5..065e97ef9 100644 --- a/ccpp/driver/CCPP_driver.F90 +++ b/ccpp/driver/CCPP_driver.F90 @@ -132,6 +132,14 @@ subroutine CCPP_step (step, nblks, ierr) return end if + ! call timestep_init for "physics"---required for Land IAU + call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="physics", ierr=ierr) + if (ierr/=0) then + write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group physics" + write(0,'(a)') trim(cdata_domain%errmsg) + return + end if + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! DH* 20210104 - this block of code will be removed once the CCPP framework ! ! fully supports handling diagnostics through its metadata, work in progress ! @@ -214,6 +222,14 @@ subroutine CCPP_step (step, nblks, ierr) return end if + ! call timestep_finalize for "physics"---required for Land IAU + call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="physics", ierr=ierr) + if (ierr/=0) then + write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group physics" + write(0,'(a)') trim(cdata_domain%errmsg) + return + end if + ! Physics finalize else if (trim(step)=="physics_finalize") then From 3dbcd60ee18c51a8013d173fe167eaeef977ba37 Mon Sep 17 00:00:00 2001 From: tsga Date: Wed, 4 Sep 2024 04:26:33 +0000 Subject: [PATCH 02/35] merge land IAU --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 44700d5e9..9b3dccdd0 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 44700d5e92f00524ade276062e1f7c50e554c0fb +Subproject commit 9b3dccdd0d73af70da9e40205deec5f8b5eadd0a From 2c99f59086b77ca55786290a3d6d58b90aa5647c Mon Sep 17 00:00:00 2001 From: tsga Date: Fri, 13 Sep 2024 08:04:22 +0000 Subject: [PATCH 03/35] use defaults when lnd_iau_nml doesn't exist --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 9b3dccdd0..10e1434d4 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 9b3dccdd0d73af70da9e40205deec5f8b5eadd0a +Subproject commit 10e1434d4ba8bcb0fcaf6090633ee752f7ae1da3 From fed6eb8401bc3095e5e7cd242ca19388b5cc292e Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 9 Oct 2024 12:58:34 -0400 Subject: [PATCH 04/35] move declaration of lnd_iau_mod DDT instances from the CCPP to the host --- ccpp/config/ccpp_prebuild_config.py | 7 +++++++ ccpp/data/GFS_typedefs.F90 | 9 ++++++++- ccpp/data/GFS_typedefs.meta | 18 ++++++++++++++++++ ccpp/physics | 2 +- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py index 7714774fb..5e91f3ef6 100755 --- a/ccpp/config/ccpp_prebuild_config.py +++ b/ccpp/config/ccpp_prebuild_config.py @@ -21,6 +21,7 @@ 'physics/physics/Radiation/RRTMG/radlw_param.f', 'physics/physics/photochem/module_ozphys.F90', 'physics/physics/photochem/module_h2ophys.F90', + 'physics/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.F90', 'data/CCPP_typedefs.F90', 'data/GFS_typedefs.F90', 'data/CCPP_data.F90', @@ -49,6 +50,12 @@ 'module_h2ophys' : '', 'ty_h2ophys' : '', }, + 'land_iau_mod' : { + 'land_iau_mod' : '', + 'land_iau_external_data_type' : '', + 'land_iau_state_type' : '', + 'land_iau_control_type' : '', + }, 'CCPP_typedefs' : { 'GFS_interstitial_type' : 'GFS_Interstitial(cdata%thrd_no)', 'GFDL_interstitial_type' : 'GFDL_interstitial', diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 9e8bfc7d3..33c30d791 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -16,6 +16,8 @@ module GFS_typedefs use module_radlw_parameters, only: topflw_type, sfcflw_type use module_ozphys, only: ty_ozphys use module_h2ophys, only: ty_h2ophys + use land_iau_mod, only: land_iau_external_data_type, land_iau_control_type, & + land_iau_state_type implicit none @@ -480,7 +482,12 @@ module GFS_typedefs !--- For smoke and dust auxiliary inputs real (kind=kind_phys), pointer :: fire_in (:,:) => null() !< fire auxiliary inputs - + + !--- Land IAU DDTs + type(land_iau_external_data_type) :: land_iau_data + type(land_iau_control_type) :: land_iau_control + type(land_iau_state_type) :: land_iau_state + contains procedure :: create => sfcprop_create !< allocate array data end type GFS_sfcprop_type diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 2fee7ba12..a1a10f7bb 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -2387,6 +2387,24 @@ type = real kind = kind_phys active = (do_fire_coupling) +[land_iau_data] + standard_name = land_data_assimilation_data + long_name = land data assimilation data + units = mixed + dimensions = () + type = land_iau_external_data_type +[land_iau_control] + standard_name = land_data_assimilation_control + long_name = land data assimilation control + units = mixed + dimensions = () + type = land_iau_control_type +[land_iau_state] + standard_name = land_data_assimilation_interpolated_data + long_name = land data assimilation space- and time-interpolated + units = mixed + dimensions = () + type = land_iau_state_type ######################################################################## [ccpp-table-properties] diff --git a/ccpp/physics b/ccpp/physics index b4bb1fc31..7188fc8a7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit b4bb1fc3167593d16f734103fb0e7c2faa1621cb +Subproject commit 7188fc8a7a73f9de29e470b8a86df90b67eb39e3 From ac4ae6c36eb19f8f1c92a0c7fededd3e032aa86b Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 9 Oct 2024 20:05:06 +0000 Subject: [PATCH 05/35] add lnd_iau_mod.F90 as dependency for the GFS_typedefs module --- ccpp/data/GFS_typedefs.meta | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index a1a10f7bb..5a9409764 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -10091,7 +10091,7 @@ dependencies = hooks/machine.F,hooks/physcons.F90 dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f dependencies = photochem/module_ozphys.F90,photochem/module_h2ophys.F90 - dependencies = MP/GFDL/GFDL_parse_tracers.F90 + dependencies = SFC_Models/Land/Noahmp/lnd_iau_mod.F90,MP/GFDL/GFDL_parse_tracers.F90 [ccpp-arg-table] name = GFS_typedefs diff --git a/ccpp/physics b/ccpp/physics index 7188fc8a7..bf3e1e165 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7188fc8a7a73f9de29e470b8a86df90b67eb39e3 +Subproject commit bf3e1e1659c9ad1240738bcd4e32c5d1301d6277 From 3523657a78ae6909f030fa279b49f8e0ddd61c0c Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 9 Oct 2024 22:13:57 +0000 Subject: [PATCH 06/35] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index bf3e1e165..4782f6866 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit bf3e1e1659c9ad1240738bcd4e32c5d1301d6277 +Subproject commit 4782f68666a0e719a217ba42d485e4f65ab3b914 From 78716ca2eec7d8466de1a6158ceca9ad80d59de1 Mon Sep 17 00:00:00 2001 From: tsga Date: Thu, 10 Oct 2024 19:22:10 +0000 Subject: [PATCH 07/35] update physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 4782f6866..e07ba9496 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4782f68666a0e719a217ba42d485e4f65ab3b914 +Subproject commit e07ba9496a8e9f81aa620af8247abb93f33f8882 From 1f1a5d01b85c13e83267c68a0985be9d0d91c69b Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Tue, 15 Oct 2024 18:11:34 -0400 Subject: [PATCH 08/35] set land_iau_control from host --- ccpp/data/GFS_typedefs.F90 | 63 +++++++++++++++++++++++++++++++++++++- ccpp/physics | 2 +- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 33c30d791..5b417197b 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -18,6 +18,7 @@ module GFS_typedefs use module_h2ophys, only: ty_h2ophys use land_iau_mod, only: land_iau_external_data_type, land_iau_control_type, & land_iau_state_type + use land_iau_mod, only: land_iau_mod_set_control implicit none @@ -1651,6 +1652,19 @@ module GFS_typedefs type(ty_h2ophys) :: h2ophys !< DDT with data needed by h2o photchemistry physics. integer :: levh2o !< Number of vertical layers in stratospheric h2o data. integer :: h2o_coeff !< Number of coefficients in stratospheric h2o data. + +! !--- Land IAU +! !> land iau setting read from namelist +! logical :: do_land_iau +! real(kind=kind_phys) :: land_iau_delthrs +! character(len=240) :: land_iau_inc_files(7) +! real(kind=kind_phys) :: land_iau_fhrs(7) +! logical :: land_iau_filter_increments +! integer :: lsoil_incr +! logical :: land_iau_upd_stc +! logical :: land_iau_upd_slc +! logical :: land_iau_do_stcsmc_adjustment +! real(kind=kind_phys) :: land_iau_min_T_increment contains procedure :: init => control_initialize @@ -2315,6 +2329,9 @@ subroutine sfcprop_create (Sfcprop, Model) type(GFS_control_type), intent(in) :: Model integer :: IM + character(len=512) :: errmsg + integer :: errflg + IM = Model%ncols !--- physics and radiation @@ -2888,6 +2905,20 @@ subroutine sfcprop_create (Sfcprop, Model) Sfcprop%smoke_fire = zero endif + ! land iau control setting + call land_iau_mod_set_control(Sfcprop%land_iau_control, & + Model%fn_nml, Model%input_nml_file, Model%me, Model%master, & + Model%isc, Model%jsc, Model%nx, Model%ny, Model%tile_num, Model%nblks, Model%blksz, & + Model%lsoil, Model%lsnow_lsm, Model%dtp, Model%fhour, errmsg, errflg) + + if (errflg/=0) then + if (Model%me==Model%master) then + write(0,'(a)') "Error inside sfcprop_create" + write(0,'(a)') trim(errmsg) + stop + endif + endif + end subroutine sfcprop_create @@ -4021,6 +4052,18 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & real(kind=kind_phys) :: radar_tten_limits(2) = (/ limit_unspecified, limit_unspecified /) integer :: itime + ! !> land iau setting read from namelist + ! logical :: do_land_iau = .false. + ! real(kind=kind_phys) :: land_iau_delthrs = 0 + ! character(len=240) :: land_iau_inc_files(7) = '' + ! real(kind=kind_phys) :: land_iau_fhrs(7) = -1 + ! logical :: land_iau_filter_increments = .false. + ! integer :: lsoil_incr = 4 + ! logical :: land_iau_upd_stc = .false. + ! logical :: land_iau_upd_slc = .false. + ! logical :: land_iau_do_stcsmc_adjustment = .false. + ! real(kind=kind_phys) :: land_iau_min_T_increment = 0.0001 + !--- END NAMELIST VARIABLES NAMELIST /gfs_physics_nml/ & @@ -4177,7 +4220,13 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & ! and (maybe) convection suppression fh_dfi_radar, radar_tten_limits, do_cap_suppress, & !--- GSL lightning threat indices - lightning_threat + lightning_threat !, & + ! !--- land_iau_nml + ! do_land_iau, land_iau_delthrs, land_iau_inc_files, & + ! land_iau_fhrs, land_iau_filter_increments, lsoil_incr, & + ! land_iau_upd_stc, land_iau_upd_slc, & + ! land_iau_do_stcsmc_adjustment, land_iau_min_T_increment + !--- other parameters integer :: nctp = 0 !< number of cloud types in CS scheme @@ -6293,6 +6342,18 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & endif !--- END CODE FROM GLOOPB +! !---Land IAU Settings +! Model%do_land_iau = do_land_iau +! Model%iau_delthrs = land_iau_delthrs +! Model%iau_inc_files = land_iau_inc_files +! Model%iaufhrs = land_iau_fhrs +! Model%iau_filter_increments = land_iau_filter_increments +! Model%lsoil_incr = lsoil_incr +! Model%upd_stc = land_iau_upd_stc +! Model%upd_slc = land_iau_upd_slc +! Model%do_stcsmc_adjustment = land_iau_do_stcsmc_adjustment +! Model%min_T_increment = land_iau_min_T_increment + call Model%print () end subroutine control_initialize diff --git a/ccpp/physics b/ccpp/physics index 4782f6866..6e3bc2f49 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4782f68666a0e719a217ba42d485e4f65ab3b914 +Subproject commit 6e3bc2f49b389d55e94544407cda905c14be4bd3 From b25b4c74612cb396a8331057e3a44314b1422fff Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Wed, 16 Oct 2024 07:41:44 -0400 Subject: [PATCH 09/35] calculate snowsoil mask at runtime --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 6e3bc2f49..1a6778566 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 6e3bc2f49b389d55e94544407cda905c14be4bd3 +Subproject commit 1a6778566bc5e8d99ed1363998ab902f7eb6fcd0 From 277874b4890b8a605b765b05cf66bb4646c37d12 Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Wed, 16 Oct 2024 15:00:54 -0400 Subject: [PATCH 10/35] combine DDTs holding increments; get rid of scheme level global array --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 1a6778566..c58be1217 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 1a6778566bc5e8d99ed1363998ab902f7eb6fcd0 +Subproject commit c58be12171ad858978c5002dc3e0d0a7fe6f58e8 From 71079601a6b67f6b10029614649e5f6e803bca39 Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Wed, 16 Oct 2024 16:13:24 -0400 Subject: [PATCH 11/35] modify subroutines set/update increments --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index c58be1217..590bb8027 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c58be12171ad858978c5002dc3e0d0a7fe6f58e8 +Subproject commit 590bb8027eabaa30624c70f64e043a5c3d7311d4 From 83e49ec9a623c15a5a00b375b34a684f998e82de Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Thu, 17 Oct 2024 08:00:45 -0400 Subject: [PATCH 12/35] default weight factors --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 590bb8027..e98f8d85a 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 590bb8027eabaa30624c70f64e043a5c3d7311d4 +Subproject commit e98f8d85a7112d975071ee3bddc9a33a3d074020 From 7cac11ee423736444526f10f35d9f2e31702c409 Mon Sep 17 00:00:00 2001 From: tsga Date: Thu, 17 Oct 2024 12:02:22 +0000 Subject: [PATCH 13/35] update physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index e07ba9496..e98f8d85a 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e07ba9496a8e9f81aa620af8247abb93f33f8882 +Subproject commit e98f8d85a7112d975071ee3bddc9a33a3d074020 From 65cc5eabc6f0e444bba24f06ed79149e01f8bd40 Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Thu, 17 Oct 2024 08:11:15 -0400 Subject: [PATCH 14/35] edit --- ccpp/data/GFS_typedefs.F90 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 5b417197b..3e466d41d 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -17,8 +17,7 @@ module GFS_typedefs use module_ozphys, only: ty_ozphys use module_h2ophys, only: ty_h2ophys use land_iau_mod, only: land_iau_external_data_type, land_iau_control_type, & - land_iau_state_type - use land_iau_mod, only: land_iau_mod_set_control + land_iau_state_type, land_iau_mod_set_control implicit none From 788525531e17d1cdc3d23dc7d48c6859810cc1d5 Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Thu, 17 Oct 2024 08:38:09 -0400 Subject: [PATCH 15/35] move weight factors to _IAU_Data --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index e98f8d85a..89a1d0bf3 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e98f8d85a7112d975071ee3bddc9a33a3d074020 +Subproject commit 89a1d0bf32f436dc0cfd415906f8ac9544864d2b From 07ce6873ecf5f508e422b938be4b0fe4401706f8 Mon Sep 17 00:00:00 2001 From: tsga Date: Thu, 17 Oct 2024 12:39:41 +0000 Subject: [PATCH 16/35] update physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index e98f8d85a..89a1d0bf3 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e98f8d85a7112d975071ee3bddc9a33a3d074020 +Subproject commit 89a1d0bf32f436dc0cfd415906f8ac9544864d2b From 4e1170af2fda3d3435ed0830296fd9313988595d Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Thu, 17 Oct 2024 08:54:52 -0400 Subject: [PATCH 17/35] update noahmpdrv meta --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 89a1d0bf3..fa3591e32 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 89a1d0bf32f436dc0cfd415906f8ac9544864d2b +Subproject commit fa3591e321a74110b01b9ec07fdf586f3ee82e97 From 92e67ec280ba1981a0518f938b0ea93105655d72 Mon Sep 17 00:00:00 2001 From: tsga Date: Thu, 17 Oct 2024 12:56:26 +0000 Subject: [PATCH 18/35] update physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 89a1d0bf3..fa3591e32 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 89a1d0bf32f436dc0cfd415906f8ac9544864d2b +Subproject commit fa3591e321a74110b01b9ec07fdf586f3ee82e97 From 306e46ca8bd75579a99e98f4de205674f3a20274 Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Sun, 20 Oct 2024 09:36:34 -0400 Subject: [PATCH 19/35] fix time interval bounds --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index fa3591e32..a9c44e65d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit fa3591e321a74110b01b9ec07fdf586f3ee82e97 +Subproject commit a9c44e65d5d342dbf8f04ce8b0b1b7dfc5bcb42d From 2b4f5a45280942d805561534c4fcafadd573da97 Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Sun, 20 Oct 2024 10:54:42 -0400 Subject: [PATCH 20/35] handle valid time range better --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index a9c44e65d..28dc54400 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit a9c44e65d5d342dbf8f04ce8b0b1b7dfc5bcb42d +Subproject commit 28dc544001a6ee7650ac8fb262376fda567b94dd From 44277d9741ac5d02cab79ac36bdd1bd280acd4ed Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Sun, 20 Oct 2024 12:26:43 -0400 Subject: [PATCH 21/35] udpate land iau --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 28dc54400..7cac448ff 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 28dc544001a6ee7650ac8fb262376fda567b94dd +Subproject commit 7cac448ffb60ab00aaca991ce207ff84c38b3bac From ae537e46bdb9fdfee7be04e2618a5dbfe895cc5e Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Mon, 21 Oct 2024 10:44:41 -0400 Subject: [PATCH 22/35] do netcdf error handling inside get_var3d_values --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 7cac448ff..2097bd01b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7cac448ffb60ab00aaca991ce207ff84c38b3bac +Subproject commit 2097bd01b25b8b03cbb47d94aeb309624df8c250 From 63e59174cbaafc7341276dd84ff0f22affe79b43 Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Mon, 21 Oct 2024 10:51:45 -0400 Subject: [PATCH 23/35] error handling for read_iau_forcing_fv3 --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 2097bd01b..403312a8b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 2097bd01b25b8b03cbb47d94aeb309624df8c250 +Subproject commit 403312a8b0e73bad455413beb01786a919e1e781 From 0c9180a4d9b3f33d1c9db6586105b6e5a467d1fc Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Mon, 21 Oct 2024 13:52:57 -0400 Subject: [PATCH 24/35] remove redeclared constants in _timestep_int --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 403312a8b..df8ed4821 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 403312a8b0e73bad455413beb01786a919e1e781 +Subproject commit df8ed4821c2e6e0024a6820119243c4b529377bc From 38d0110936157a7a14770be3891844cb2e0d3de8 Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Mon, 21 Oct 2024 14:17:30 -0400 Subject: [PATCH 25/35] fix compilation errors --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index df8ed4821..4c78f46ad 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit df8ed4821c2e6e0024a6820119243c4b529377bc +Subproject commit 4c78f46ad26345a9b8e6b0e7f7868c34ccb68c2a From 41ee119be10c7c0452863261c584a7a3474d4da0 Mon Sep 17 00:00:00 2001 From: tsga Date: Wed, 30 Oct 2024 17:07:48 +0000 Subject: [PATCH 26/35] update for NoahMP component model --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 4c78f46ad..b008e2590 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4c78f46ad26345a9b8e6b0e7f7868c34ccb68c2a +Subproject commit b008e259020b5421989da9704fc57215b6dc1dac From a16d991ed24b09838f14a2cbefb18b8058863a8b Mon Sep 17 00:00:00 2001 From: Tseganeh Gichamo <1621305073113305@mil> Date: Wed, 30 Oct 2024 14:11:33 -0400 Subject: [PATCH 27/35] fix compile error --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 4c78f46ad..ebb7b6b70 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4c78f46ad26345a9b8e6b0e7f7868c34ccb68c2a +Subproject commit ebb7b6b70679c88bb3e31fd3865741bbe166661c From 300cdfcfcd54997a27ba5db508c45fa9adacd591 Mon Sep 17 00:00:00 2001 From: tsga Date: Wed, 30 Oct 2024 19:15:45 +0000 Subject: [PATCH 28/35] merge ccpp/physics with ufs/dev --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index ebb7b6b70..3b683ad51 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit ebb7b6b70679c88bb3e31fd3865741bbe166661c +Subproject commit 3b683ad5186bd6f205c3ef984de4728792437060 From 2573b5fdfeed667789c0f01c3c8975ce550a9f13 Mon Sep 17 00:00:00 2001 From: tsga Date: Thu, 31 Oct 2024 12:59:06 +0000 Subject: [PATCH 29/35] fix real type for mask in ccpp/physics lnd_iau --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 3b683ad51..db2c10f6f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3b683ad5186bd6f205c3ef984de4728792437060 +Subproject commit db2c10f6f45a7a396e29cb6ac018ae6d31b59a2a From e1510d2365b3d9598011947831f9648255c9b0cc Mon Sep 17 00:00:00 2001 From: tsga Date: Wed, 13 Nov 2024 10:10:52 +0000 Subject: [PATCH 30/35] merge ufs/dev for ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index db2c10f6f..eac6b9ad1 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit db2c10f6f45a7a396e29cb6ac018ae6d31b59a2a +Subproject commit eac6b9ad1073545a2ef39522f7ea6b1bd92f3db6 From 3c8961b9d59a4eb7fba6ff8ce010e7e5b74a85cd Mon Sep 17 00:00:00 2001 From: tsga Date: Fri, 15 Nov 2024 14:00:05 +0000 Subject: [PATCH 31/35] clean up comments and warning --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index eac6b9ad1..b9e04297f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit eac6b9ad1073545a2ef39522f7ea6b1bd92f3db6 +Subproject commit b9e04297fc568d426921f1027b1e5a1036f94fc1 From d2a98da80e6915a18b2a99be639240f7bbf707be Mon Sep 17 00:00:00 2001 From: tsga Date: Fri, 15 Nov 2024 17:51:03 +0000 Subject: [PATCH 32/35] minor edit to combine use lnd_iau_mod lines --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index b9e04297f..4343656a0 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit b9e04297fc568d426921f1027b1e5a1036f94fc1 +Subproject commit 4343656a098516517257c0913689f70a81579e74 From 2429d661d1758c22935558df75f6b66bd710ac11 Mon Sep 17 00:00:00 2001 From: jkbk2004 Date: Fri, 15 Nov 2024 14:42:41 -0600 Subject: [PATCH 33/35] fix gitmodules to point to physics feature branch --- .gitmodules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..49aa5ac8e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev + #url = https://github.com/ufs-community/ccpp-physics + #branch = ufs/dev + url = https://github.com/tsga/ccpp-physics + branch = feature/lnd_iau [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From b9274c961c1094c2f32c2f76adc634ff52e3bf5e Mon Sep 17 00:00:00 2001 From: "Tseganeh Z. Gichamo" Date: Mon, 18 Nov 2024 13:13:01 -0500 Subject: [PATCH 34/35] Update .gitmodules to point to ufs/dev --- .gitmodules | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 49aa5ac8e..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/ufs-community/ccpp-physics - #branch = ufs/dev - url = https://github.com/tsga/ccpp-physics - branch = feature/lnd_iau + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 357bd5ef66b36a8ba0a4c7b719f7621f7de6c403 Mon Sep 17 00:00:00 2001 From: jkbk2004 Date: Mon, 18 Nov 2024 12:31:16 -0600 Subject: [PATCH 35/35] update physics hash --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 4343656a0..cfa18610e 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4343656a098516517257c0913689f70a81579e74 +Subproject commit cfa18610e546ddb633c117afd394bf4aaaeec4dc