diff --git a/.gitmodules b/.gitmodules index dc0798c32..4ccfca176 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/scrasmussen/ccpp-physics + branch = ufs-dev-PR260-memcheck-fixes [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index dec7ce44a..28016dda7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit dec7ce44a67ee6c36abf4f9946eb6dcb03324c2a +Subproject commit 28016dda796f1073739d8a50887d0f2fb9d09027 diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90 index a19a6f46c..aac710447 100644 --- a/scm/src/GFS_typedefs.F90 +++ b/scm/src/GFS_typedefs.F90 @@ -29,7 +29,7 @@ module GFS_typedefs integer, parameter :: dfi_radar_max_intervals = 4 !< Number of radar-derived temperature tendency and/or convection suppression intervals. Do not change. real(kind=kind_phys), parameter :: limit_unspecified = 1e12 !< special constant for "namelist value was not provided" in radar-derived temperature tendency limit range - + integer, parameter :: no_tracer = -99 !> \section arg_table_GFS_typedefs @@ -2485,7 +2485,6 @@ subroutine sfcprop_create (Sfcprop, Model) allocate (Sfcprop%slope_save (IM)) allocate (Sfcprop%shdmin (IM)) allocate (Sfcprop%shdmax (IM)) - allocate (Sfcprop%snoalb (IM)) allocate (Sfcprop%tg3 (IM)) allocate (Sfcprop%vfrac (IM)) allocate (Sfcprop%vtype (IM)) @@ -2505,7 +2504,6 @@ subroutine sfcprop_create (Sfcprop, Model) Sfcprop%slope_save = zero Sfcprop%shdmin = clear_val Sfcprop%shdmax = clear_val - Sfcprop%snoalb = clear_val Sfcprop%tg3 = clear_val Sfcprop%vfrac = clear_val Sfcprop%vtype = zero @@ -4284,9 +4282,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & !--- read in the namelist #ifdef INTERNAL_FILE_NML - ! allocate required to work around GNU compiler bug 100886 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100886 allocate (Model%input_nml_file, mold=input_nml_file) - Model%input_nml_file => input_nml_file + Model%input_nml_file = input_nml_file read(Model%input_nml_file, nml=gfs_physics_nml) ! Set length (number of lines) in namelist for internal reads Model%input_nml_file_length = size(Model%input_nml_file) @@ -8419,12 +8416,12 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center) endif end subroutine diag_phys_zero - + function get_tracer_index (tracer_names, name) character(len=32), intent(in) :: tracer_names(:) character(len=*), intent(in) :: name - + !--- local variables integer :: get_tracer_index integer :: i