Skip to content

Commit

Permalink
Merge commit '81a347c6635ba4a58f5eb8fc3f696a0d530f80fc' into jgfouca/…
Browse files Browse the repository at this point in the history
…branch-for-to-acme-12-06-2017-pr

* commit '81a347c6635ba4a58f5eb8fc3f696a0d530f80fc':
  fix issue in scripts_regression_tests
  Add ability to customize CaseStatus success message for a phase.
  Fix bug in compare namelists
  add test for xmlquery DOCN_MODE
  Fix memory leak of newtimers in merge_thread_data
  in splitting comp vars make sure comp isnt subset of name
  Update ChangeLog
  nthrds > 1 should set build_threaded flag
  Update ChangeLog
  Update ChangeLog
  fix pylint issue
  fix gptl threaded build, batch change for cheyenne
  correct path for includes used in build
  Check for unicode in expect()
  update ACME to E3SM and changes related to Issue #1519 and PR #2062
  Do not use normalization when mapping glc2ocn
  Add comments about not needing to add fields to x2o_fluxes and x2i_fluxes
  Point to new glc2ocn mapping files
  Allow different glc2ocn mappings for liq and ice
  • Loading branch information
jgfouca committed Dec 6, 2017
2 parents bf4a737 + 1d285c8 commit 3399eb1
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions share/timing/gptl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3389,6 +3389,7 @@ static int merge_thread_data()
}
}

free(newtimers);
free(sort[0]);
/* don't free timerlist[0], since needed for subsequent steps in gathering global statistics */
for (t = 1; t < nthreads; t++) {
Expand Down

0 comments on commit 3399eb1

Please sign in to comment.