From fbfdd78e07fb6c6ec32747a543cd62d53c596036 Mon Sep 17 00:00:00 2001 From: "Shrinivas.Moorthi" Date: Tue, 8 Dec 2020 20:18:42 -0500 Subject: [PATCH 1/2] - Update .gitmodules and submodule pointer for ccpp-physics for code review and testing - Fix bug io/FV3GFS_io.F90 to obtain restart reproducibility for uncoupled and coupled runs - contributed by @SMoorthi-emc --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- io/FV3GFS_io.F90 | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..1240e891a 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/climbfuji/ccpp-physics + branch = final_gfsv16_changes diff --git a/ccpp/physics b/ccpp/physics index d076cc2ba..0144a5fca 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d076cc2bac2e34fc22a00e145ce6423def61abdb +Subproject commit 0144a5fcaf54ad066a5a32c34b06c03e18424a28 diff --git a/io/FV3GFS_io.F90 b/io/FV3GFS_io.F90 index 03871255e..6a07b3853 100644 --- a/io/FV3GFS_io.F90 +++ b/io/FV3GFS_io.F90 @@ -962,11 +962,11 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain) endif #endif !--- register the 3D fields - if (Model%frac_grid) then +! if (Model%frac_grid) then sfc_name3(0) = 'tiice' var3_p => sfc_var3ice(:,:,:) id_restart = register_restart_field(Sfc_restart, fn_srf, sfc_name3(0), var3_p, domain=fv_domain, mandatory=.false.) - end if +! end if do num = 1,nvar_s3 var3_p => sfc_var3(:,:,:,num) @@ -1994,11 +1994,11 @@ subroutine sfc_prop_restart_write (Sfcprop, Atm_block, Model, fv_domain, timesta #endif !--- register the 3D fields - if (Model%frac_grid) then +! if (Model%frac_grid) then sfc_name3(0) = 'tiice' var3_p => sfc_var3ice(:,:,:) id_restart = register_restart_field(Sfc_restart, fn_srf, sfc_name3(0), var3_p, domain=fv_domain) - endif +! endif do num = 1,nvar3 var3_p => sfc_var3(:,:,:,num) From bd75c52ac2714e59cc3e3381f3afdabad50e614b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 14 Dec 2020 08:54:40 -0700 Subject: [PATCH 2/2] Revert change to .gitmodules and update submodule pointer for ccpp-physics --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1240e891a..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = master - url = https://github.com/climbfuji/ccpp-physics - branch = final_gfsv16_changes + url = https://github.com/NCAR/ccpp-physics + branch = master diff --git a/ccpp/physics b/ccpp/physics index c5ee58a65..8f4e4e1c9 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c5ee58a658d4ed6d83356746792b21401e50fd79 +Subproject commit 8f4e4e1c9433e099a24fb0f541ec87f04ca50f70