Skip to content

Commit 444fd81

Browse files
authored
Merge pull request #581 from scrasmussen/ufs-community-ccpp-physics-260-memcheck-fixes
ufs-community ccpp-physics PR260 memcheck fixes
2 parents 982ca58 + 8c33dc1 commit 444fd81

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
branch = main
55
[submodule "ccpp-physics"]
66
path = ccpp/physics
7-
url = https://github.com/NCAR/ccpp-physics
8-
branch = main
7+
url = https://github.com/scrasmussen/ccpp-physics
8+
branch = ufs-dev-PR260-memcheck-fixes
99
[submodule "CMakeModules"]
1010
path = CMakeModules
1111
url = https://github.com/noaa-emc/CMakeModules

scm/src/GFS_typedefs.F90

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module GFS_typedefs
2929
integer, parameter :: dfi_radar_max_intervals = 4 !< Number of radar-derived temperature tendency and/or convection suppression intervals. Do not change.
3030

3131
real(kind=kind_phys), parameter :: limit_unspecified = 1e12 !< special constant for "namelist value was not provided" in radar-derived temperature tendency limit range
32-
32+
3333
integer, parameter :: no_tracer = -99
3434

3535
!> \section arg_table_GFS_typedefs
@@ -2485,7 +2485,6 @@ subroutine sfcprop_create (Sfcprop, Model)
24852485
allocate (Sfcprop%slope_save (IM))
24862486
allocate (Sfcprop%shdmin (IM))
24872487
allocate (Sfcprop%shdmax (IM))
2488-
allocate (Sfcprop%snoalb (IM))
24892488
allocate (Sfcprop%tg3 (IM))
24902489
allocate (Sfcprop%vfrac (IM))
24912490
allocate (Sfcprop%vtype (IM))
@@ -2505,7 +2504,6 @@ subroutine sfcprop_create (Sfcprop, Model)
25052504
Sfcprop%slope_save = zero
25062505
Sfcprop%shdmin = clear_val
25072506
Sfcprop%shdmax = clear_val
2508-
Sfcprop%snoalb = clear_val
25092507
Sfcprop%tg3 = clear_val
25102508
Sfcprop%vfrac = clear_val
25112509
Sfcprop%vtype = zero
@@ -4284,9 +4282,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
42844282

42854283
!--- read in the namelist
42864284
#ifdef INTERNAL_FILE_NML
4287-
! allocate required to work around GNU compiler bug 100886 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100886
42884285
allocate (Model%input_nml_file, mold=input_nml_file)
4289-
Model%input_nml_file => input_nml_file
4286+
Model%input_nml_file = input_nml_file
42904287
read(Model%input_nml_file, nml=gfs_physics_nml)
42914288
! Set length (number of lines) in namelist for internal reads
42924289
Model%input_nml_file_length = size(Model%input_nml_file)
@@ -8419,12 +8416,12 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center)
84198416
endif
84208417

84218418
end subroutine diag_phys_zero
8422-
8419+
84238420
function get_tracer_index (tracer_names, name)
84248421

84258422
character(len=32), intent(in) :: tracer_names(:)
84268423
character(len=*), intent(in) :: name
8427-
8424+
84288425
!--- local variables
84298426
integer :: get_tracer_index
84308427
integer :: i

0 commit comments

Comments
 (0)