Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Feature merge results #187

Draft
wants to merge 27 commits into
base: develop
Choose a base branch
from
Draft

[WIP] Feature merge results #187

wants to merge 27 commits into from

Commits on Jun 18, 2019

  1. updated script to merge HDF5 resultfiles

    @LeonardSchmiester
    LeonardSchmiester committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    0f889f4 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2019

  1. Update misc/mergeResultFiles.py 

    fixed typo

Co-Authored-By: Daniel Weindl <[email protected]>
    @LeonardSchmiester @dweindl
    LeonardSchmiester and dweindl authored Jun 19, 2019
    Configuration menu
    Copy the full SHA
    07c3a04 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2019

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Sep 7, 2019
    Configuration menu
    Copy the full SHA
    db4ba48 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Oct 8, 2019
    Configuration menu
    Copy the full SHA
    452a1a2 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2019

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Oct 9, 2019
    Configuration menu
    Copy the full SHA
    d4f5a94 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Oct 9, 2019
    Configuration menu
    Copy the full SHA
    72caf06 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2019

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Nov 20, 2019
    Configuration menu
    Copy the full SHA
    27ff07d View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    8bc66d8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    986f4e7 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2019

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Dec 12, 2019
    Configuration menu
    Copy the full SHA
    6b90925 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2019

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Dec 14, 2019
    Configuration menu
    Copy the full SHA
    192151c View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Jan 8, 2020
    Configuration menu
    Copy the full SHA
    c4485e2 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Mar 13, 2020
    Configuration menu
    Copy the full SHA
    e8f38c5 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2020

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Apr 4, 2020
    Configuration menu
    Copy the full SHA
    19b5dd1 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. Merge branch 'develop' into feature_mergeResults

    @paulstapor
    paulstapor authored Apr 21, 2020
    Configuration menu
    Copy the full SHA
    d36dfb3 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2020

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Jun 16, 2020
    Configuration menu
    Copy the full SHA
    dac15aa View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2020

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Jul 19, 2020
    Configuration menu
    Copy the full SHA
    e77f8c8 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2021

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Feb 21, 2021
    Configuration menu
    Copy the full SHA
    41ca3da View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2021

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Mar 13, 2021
    Configuration menu
    Copy the full SHA
    157cad0 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2021

  1. SuperMUC build script: skip boost

    @dweindl
    dweindl committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    7f569a9 View commit details
    Browse the repository at this point in the history

  2. Fix race condition with parallel HDF5 calls (#345) 

    * Fix race condition with parallel HDF5 calls

Add some locks, in particular for H5Location::nameExists.
Also remove some unnecessary H5File::getId calls.

* Safely close HDF5 files

* Check pthread_create retval

* cleanup
    @dweindl
    dweindl authored Jun 28, 2021
    Configuration menu
    Copy the full SHA
    eb33a10 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. Fix HDF5 generation for state reinitialization with estimated initial… 

    … conditions (#344)
    @dweindl
    dweindl committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    72f29d9 View commit details
    Browse the repository at this point in the history

  2. Cleanup PEtab import (#346)

    @dweindl
    dweindl authored Jul 1, 2021
    Configuration menu
    Copy the full SHA
    46589e5 View commit details
    Browse the repository at this point in the history

  3. Update AMICI to develop@8ef53c88 (#347) 

    git subrepo clone --branch=develop --force [email protected]:AMICI-dev/AMICI.git deps/AMICI 

subrepo:
  subdir:   "deps/AMICI"
  merged:   "8ef53c88"
upstream:
  origin:   "[email protected]:AMICI-dev/AMICI.git"
  branch:   "develop"
  commit:   "8ef53c88"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
    @dweindl
    dweindl authored Jul 1, 2021
    Configuration menu
    Copy the full SHA
    e5e4fb3 View commit details
    Browse the repository at this point in the history

  4. Fixup AMICI 

    AMICI-dev/AMICI#1522
    @dweindl
    dweindl committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    98a0746 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Jul 12, 2021
    Configuration menu
    Copy the full SHA
    aa9db59 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. Merge branch 'develop' into feature_mergeResults

    @dweindl
    dweindl authored Oct 4, 2021
    Configuration menu
    Copy the full SHA
    58c88bc View commit details
    Browse the repository at this point in the history