Skip to content

Commit

Permalink
Merge pull request #3 from glemieux/pr885-manage-externals-update-and…
Browse files Browse the repository at this point in the history
…-clean

PR882 manage externals update and clean
  • Loading branch information
JessicaNeedham authored Mar 26, 2020
2 parents 300c2f2 + c2edc13 commit cad203f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion Externals_CLM.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
local_path = src/fates
protocol = git
repo_url = https://github.com/NGEET/fates
tag = sci.1.33.0_api.8.1.0
tag = sci.1.34.0_api.9.0.0
required = True

[PTCLM]
Expand Down
4 changes: 0 additions & 4 deletions src/main/histFileMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,6 @@ subroutine htape_addfld (t, f, avgflag)
integer :: numc ! total number of columns across all processors
integer :: nump ! total number of pfts across all processors
integer :: num2d ! size of second dimension (e.g. .number of vertical levels)
character(len=hist_dim_name_length) :: type2d
integer :: beg1d_out,end1d_out ! history output per-proc 1d beginning and ending indices
integer :: beg1d,end1d ! beginning and ending indices for this field (assume already set)
integer :: num1d_out ! history output 1d size
Expand Down Expand Up @@ -1048,9 +1047,6 @@ subroutine htape_addfld (t, f, avgflag)
tape(t)%hlist(n)%avgflag = avgflag
end if

type2d = tape(t)%hlist(n)%field%type2d


end subroutine htape_addfld

!-----------------------------------------------------------------------
Expand Down
4 changes: 0 additions & 4 deletions src/utils/clmfates_interfaceMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2066,9 +2066,6 @@ subroutine init_history_io(this,bounds_proc)
dk_index = this%fates_hist%hvars(ivar)%dim_kinds_index
ioname = trim(this%fates_hist%dim_kinds(dk_index)%name)

write(iulog,*) 'attempt ioname: ', ioname
write(iulog,*) 'dk_index: ', dk_index

select case(trim(ioname))
case(patch_r8)
call hist_addfld1d(fname=trim(vname),units=trim(vunits), &
Expand Down Expand Up @@ -2118,7 +2115,6 @@ subroutine init_history_io(this,bounds_proc)
end select

end associate
write(iulog,*)'success: ', ioname

end do
end subroutine init_history_io
Expand Down

0 comments on commit cad203f

Please sign in to comment.