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)