From ff0ea32e8570489a72abb6ec6f5fefb4a09a5763 Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Fri, 5 May 2023 00:17:04 +0000 Subject: [PATCH 01/16] point to dkokron's atmos_cubed_sphere --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..0f4a1b84b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +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/dkokron/GFDL_atmos_cubed_sphere + branch = hafs-BcastFillNestedGridCpl [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework From 10e5028859caa5a5394e078d6cc6304438b0328c Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Sat, 13 May 2023 21:10:40 +0000 Subject: [PATCH 02/16] Modifications to replace numerous p2p transfers in fill_nested_grid_cpl by a single MPI_Bcast --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index bdeee64e8..4baa5c079 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit bdeee64e860c5091da2d169b1f4307ad466eca2c +Subproject commit 4baa5c079f428ebb425e16898ccf29a92d330de0 From 23405cbfaa9aad8bd5ef39e0c048bcbb5a420da0 Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Mon, 15 May 2023 18:16:04 +0000 Subject: [PATCH 03/16] Add reason for including ESMF in fv_control_init. Add code to cleanup structures associated with Bcast_comm --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 4baa5c079..bf3211930 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 4baa5c079f428ebb425e16898ccf29a92d330de0 +Subproject commit bf32119304bb2d0cd52fe74ef4de0ee7ad1f95d6 From ebefbfbefa1d3395322872888224be8693fb3223 Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Wed, 17 May 2023 17:06:59 +0000 Subject: [PATCH 04/16] Get rid of unneeded mpp_sync_self --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index bf3211930..1426af8d0 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit bf32119304bb2d0cd52fe74ef4de0ee7ad1f95d6 +Subproject commit 1426af8d07a32b3cadf3ccbb8255b890cfd2a0cb From 3c0cae75c28b01e12a553ca80fa3fa840e8af2dc Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Tue, 23 May 2023 18:08:36 +0000 Subject: [PATCH 05/16] Use mpp_broadcast instead of MPI_Bcast at the request of NOAA-GFDL --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 1426af8d0..c7313bfac 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 1426af8d07a32b3cadf3ccbb8255b890cfd2a0cb +Subproject commit c7313bfaceab06ac011b979f5aa0e5521e76a9a1 From b5f55909da8281b74f860e7ab003fda72cbff4bf Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Fri, 9 Jun 2023 15:10:16 +0000 Subject: [PATCH 06/16] Get rid of mpp pelist scoping calls in fill_nested_grid_cpl(). This depends on https://github.com/NOAA-GFDL/FMS/pull/1246 to be functional. More efficient 'if' test in fill_nested_grid_cpl() --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index c7313bfac..407792c7e 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit c7313bfaceab06ac011b979f5aa0e5521e76a9a1 +Subproject commit 407792c7eb3a4273bfd4a54e7248d8b9b56a56bd From 4acb99604bbbf172a5890fd9df6133ee6e7458a6 Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Fri, 9 Jun 2023 19:58:00 +0000 Subject: [PATCH 07/16] Bcast_comm and sending_proc variables not needed anymore --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index aeeaeba43..cc6fe1b98 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit aeeaeba4380ae5e3b6aa8165a8f0d52d0d6fcbad +Subproject commit cc6fe1b9888f301afd5e0311531dfd1feac5bd54 From 5992a7b103ef38b8037052a1845babee29e035ce Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Fri, 23 Jun 2023 19:24:45 +0000 Subject: [PATCH 08/16] New member of the fv_atmos_type type called BcastMember allows more efficient determination of ranks involved in the mpp_broadcast call in fill_nested_grid_cpl routine --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index cc6fe1b98..20b1ffe0f 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit cc6fe1b9888f301afd5e0311531dfd1feac5bd54 +Subproject commit 20b1ffe0fc5fe1559ddea7191ed3617cbdf0b373 From 4f2d716365a4072ccbdddd52d217a4d62f142a33 Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Fri, 23 Jun 2023 20:34:07 +0000 Subject: [PATCH 09/16] Cleanup unused variables --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 20b1ffe0f..598fd673d 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 20b1ffe0fc5fe1559ddea7191ed3617cbdf0b373 +Subproject commit 598fd673d4de066e4a972c0adf4b91f27f0c14e5 From 864efeee95045bd364c6fe2fb07d934009258c22 Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Mon, 14 Aug 2023 19:37:48 +0000 Subject: [PATCH 10/16] Port to FMS-2023.02 --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 598fd673d..e15653594 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 598fd673d4de066e4a972c0adf4b91f27f0c14e5 +Subproject commit e15653594cf80c7680ab61b39b2b0e06998ac155 From ad18caf2fa9e81ced8ee71c8a9fcfa5221549803 Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Mon, 14 Aug 2023 19:38:25 +0000 Subject: [PATCH 11/16] Port to FMS-2023.02 --- atmos_model.F90 | 4 ++-- io/module_write_restart_netcdf.F90 | 1 + io/module_wrt_grid_comp.F90 | 1 + moving_nest/fv_moving_nest_main.F90 | 9 ++------- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/atmos_model.F90 b/atmos_model.F90 index 7470f6971..61016510d 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -49,7 +49,7 @@ module atmos_model_mod use mpp_mod, only: mpp_get_current_pelist_name use mpp_mod, only: input_nml_file use fms2_io_mod, only: file_exists -use fms_mod, only: close_file, write_version_number, stdlog, stdout +use fms_mod, only: write_version_number, stdlog, stdout use fms_mod, only: clock_flag_default use fms_mod, only: check_nml_error use diag_manager_mod, only: diag_send_complete_instant @@ -806,7 +806,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step) if (mpp_pe() == mpp_root_pe()) then unit = stdlog( ) write (unit, nml=atmos_model_nml) - call close_file (unit) + ! This is a NO-OP because unit==stdlog() call close_file (unit) endif !--- set up clock time diff --git a/io/module_write_restart_netcdf.F90 b/io/module_write_restart_netcdf.F90 index 259079bb2..b8956ed92 100644 --- a/io/module_write_restart_netcdf.F90 +++ b/io/module_write_restart_netcdf.F90 @@ -11,6 +11,7 @@ module module_write_restart_netcdf use fms use netcdf use mpi + use mpp_mod, only : mpp_chksum implicit none private diff --git a/io/module_wrt_grid_comp.F90 b/io/module_wrt_grid_comp.F90 index 94e568073..40ccd0a82 100644 --- a/io/module_wrt_grid_comp.F90 +++ b/io/module_wrt_grid_comp.F90 @@ -29,6 +29,7 @@ module module_wrt_grid_comp use mpi use esmf use fms + use mpp_mod, only : mpp_init use write_internal_state use module_fv3_io_def, only : num_pes_fcst, & diff --git a/moving_nest/fv_moving_nest_main.F90 b/moving_nest/fv_moving_nest_main.F90 index 34af608c2..21dbccb7b 100644 --- a/moving_nest/fv_moving_nest_main.F90 +++ b/moving_nest/fv_moving_nest_main.F90 @@ -40,13 +40,8 @@ module fv_moving_nest_main_mod #endif use time_manager_mod, only: time_type, get_time, get_date, set_time, operator(+), & operator(-), operator(/), time_type_to_real - use fms_mod, only: file_exist, open_namelist_file, & - close_file, error_mesg, FATAL, & - check_nml_error, stdlog, & - write_version_number, & - mpp_clock_id, mpp_clock_begin, & - mpp_clock_end, CLOCK_SUBCOMPONENT, & - clock_flag_default + use fms_mod, only: FATAL, mpp_clock_id, mpp_clock_begin, & + mpp_clock_end, CLOCK_SUBCOMPONENT, clock_flag_default use mpp_mod, only: mpp_error, stdout, FATAL, WARNING, NOTE, & input_nml_file, mpp_root_pe, & mpp_npes, mpp_pe, mpp_chksum, & From 02de1d2d75014039438765ec4712951a2c4a2fa7 Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Wed, 17 Jan 2024 22:02:13 +0000 Subject: [PATCH 12/16] Sync --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index e15653594..5389cf5e7 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit e15653594cf80c7680ab61b39b2b0e06998ac155 +Subproject commit 5389cf5e7e1f2084f1bf5bab7641063e243980c0 From bcdc9a236ba1af3bc5180c70bae022a6006dbd0c Mon Sep 17 00:00:00 2001 From: Jong Kim Date: Thu, 18 Jan 2024 15:19:11 +0000 Subject: [PATCH 13/16] hash update atmos_cubed_sphere --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 5389cf5e7..0be6f6f55 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 5389cf5e7e1f2084f1bf5bab7641063e243980c0 +Subproject commit 0be6f6f55692e68ed2573e1342265a836e377930 From cc8f8be3474326b8eeb05e88c1bbf24f9549e11c Mon Sep 17 00:00:00 2001 From: Jong Kim Date: Thu, 18 Jan 2024 15:41:10 +0000 Subject: [PATCH 14/16] sync up hashses: physics framework upp --- ccpp/framework | 2 +- ccpp/physics | 2 +- upp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ccpp/framework b/ccpp/framework index 1b6352fb2..219f2e9c8 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 1b6352fb24f053b738bde72eed0ddf0b60ec7c0f +Subproject commit 219f2e9c88b7b774becac2bd1453696e105af1c4 diff --git a/ccpp/physics b/ccpp/physics index 8cb164377..a492addf8 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8cb1643774b8c0ede7bd3f2f4e0881d4f32500b8 +Subproject commit a492addf860d29d797bca488f53d39b260584924 diff --git a/upp b/upp index dccb32176..78f369b01 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit dccb32176930676ef2a258eb65571ab4e3f7e7a4 +Subproject commit 78f369b011ec41dca87a1260298d0228f2c4f38f From f2ba291f65bfe77b226710337fa659348b6ce5e1 Mon Sep 17 00:00:00 2001 From: Jong Kim Date: Fri, 19 Jan 2024 20:58:13 +0000 Subject: [PATCH 15/16] checkouted atmos_model.F90 module_wrt_grid_comp.F90 fv_moving_nest_main.F90 from develop --- atmos_model.F90 | 4 ++-- io/module_wrt_grid_comp.F90 | 1 - moving_nest/fv_moving_nest_main.F90 | 9 +++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/atmos_model.F90 b/atmos_model.F90 index 240c621a6..7105f6997 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -49,7 +49,7 @@ module atmos_model_mod use mpp_mod, only: mpp_get_current_pelist_name use mpp_mod, only: input_nml_file use fms2_io_mod, only: file_exists -use fms_mod, only: write_version_number, stdlog, stdout +use fms_mod, only: close_file, write_version_number, stdlog, stdout use fms_mod, only: clock_flag_default use fms_mod, only: check_nml_error use diag_manager_mod, only: diag_send_complete_instant @@ -807,7 +807,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step) if (mpp_pe() == mpp_root_pe()) then unit = stdlog( ) write (unit, nml=atmos_model_nml) - ! This is a NO-OP because unit==stdlog() call close_file (unit) + call close_file (unit) endif !--- set up clock time diff --git a/io/module_wrt_grid_comp.F90 b/io/module_wrt_grid_comp.F90 index bfd7aa786..b7e93e28f 100644 --- a/io/module_wrt_grid_comp.F90 +++ b/io/module_wrt_grid_comp.F90 @@ -29,7 +29,6 @@ module module_wrt_grid_comp use mpi use esmf use fms - use mpp_mod, only : mpp_init use write_internal_state use module_fv3_io_def, only : num_pes_fcst, & diff --git a/moving_nest/fv_moving_nest_main.F90 b/moving_nest/fv_moving_nest_main.F90 index 21dbccb7b..34af608c2 100644 --- a/moving_nest/fv_moving_nest_main.F90 +++ b/moving_nest/fv_moving_nest_main.F90 @@ -40,8 +40,13 @@ module fv_moving_nest_main_mod #endif use time_manager_mod, only: time_type, get_time, get_date, set_time, operator(+), & operator(-), operator(/), time_type_to_real - use fms_mod, only: FATAL, mpp_clock_id, mpp_clock_begin, & - mpp_clock_end, CLOCK_SUBCOMPONENT, clock_flag_default + use fms_mod, only: file_exist, open_namelist_file, & + close_file, error_mesg, FATAL, & + check_nml_error, stdlog, & + write_version_number, & + mpp_clock_id, mpp_clock_begin, & + mpp_clock_end, CLOCK_SUBCOMPONENT, & + clock_flag_default use mpp_mod, only: mpp_error, stdout, FATAL, WARNING, NOTE, & input_nml_file, mpp_root_pe, & mpp_npes, mpp_pe, mpp_chksum, & From 814bf81e7b3c48aaea716ae1ba523c9d1e99d905 Mon Sep 17 00:00:00 2001 From: Jong Kim Date: Mon, 22 Jan 2024 19:44:59 +0000 Subject: [PATCH 16/16] update cubed spherd hash and revrt change in gitmodules --- .gitmodules | 4 ++-- atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0f4a1b84b..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/dkokron/GFDL_atmos_cubed_sphere - branch = hafs-BcastFillNestedGridCpl + 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 0be6f6f55..65301dd7c 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 0be6f6f55692e68ed2573e1342265a836e377930 +Subproject commit 65301dd7c6b29c755a1f31b1a8e94562d3bd920c