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

Merge developer to master #195

Merged
merged 33 commits into from
Jul 19, 2023
Merged

Merge developer to master #195

merged 33 commits into from
Jul 19, 2023

Commits on Jan 12, 2022

  1. Docker build file for sw4 enabled with hdf5 and zfp compression features

    @jf-huang
    jf-huang committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    90968ac View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2022

  1. remove EXTRA_CXX_FLAGS

    @jf-huang
    jf-huang committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    82eb901 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. Merge branch 'geodynamics:developer' into developer

    @jf-huang
    jf-huang authored Jul 8, 2022
    Configuration menu
    Copy the full SHA
    d955e71 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2022

  1. Merge branch 'geodynamics:developer' into developer

    @jf-huang
    jf-huang authored Jul 31, 2022
    Configuration menu
    Copy the full SHA
    c88ccc4 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into developer

    @jf-huang
    jf-huang committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    320a92b View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2022

  1. Remove hdf5 zip file after rezip

    @jf-huang
    jf-huang committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    526b1cd View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/developer' into developer

    @jf-huang
    jf-huang committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    bdd8088 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/developer' into developer

    @jf-huang
    jf-huang committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    5760bf3 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2022

  1. Use ubuntu:20.04 instead of latest to avoid unexpected breaks; add BU… 

    …ILD_TIME to trigger build
    @jf-huang
    jf-huang committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    ec03a21 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Merge pull request #165 from geodynamics/master 

    Sync master to developer
    @andersp
    andersp authored Mar 8, 2023
    Configuration menu
    Copy the full SHA
    7e3e145 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Fix a bug with ssioutput when dumpInterval and bufferInterval are bot… 

    …h used
    @houjun
    houjun committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    a33feea View commit details
    Browse the repository at this point in the history

  2. Fix a bug with sfileoutput

    @houjun
    houjun committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    77a9db4 View commit details
    Browse the repository at this point in the history

  3. Fix an allocation issue that may cause an error when freeing the buf

    @houjun
    houjun committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    aeae8d9 View commit details
    Browse the repository at this point in the history

  4. remove redundent allocation

    @houjun
    houjun committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    49c7777 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #174 from geodynamics/tang/hdf5bugfix 

    Fix a few bugs
    @andersp
    andersp authored Mar 22, 2023
    Configuration menu
    Copy the full SHA
    49ffe8d View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Fix sfileoutput

    @houjun
    houjun committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    f6c54bf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #177 from geodynamics/tang/hdf5bugfix 

    Fix sfileoutput when there is topography
    @andersp
    andersp authored Mar 23, 2023
    Configuration menu
    Copy the full SHA
    a32e8a2 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Update sfile plotting script, now supports ploting along z(depth) dir… 

    …ection
    @houjun
    houjun committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    2bfddcf View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2023

  1. Merge branch 'geodynamics:developer' into developer

    @jf-huang
    jf-huang authored Mar 26, 2023
    Configuration menu
    Copy the full SHA
    2377937 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Update Dockerfile with recent makefile change

    @jf-huang
    jf-huang committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    43de772 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #117 from jf-huang/developer 

    Docker build file for sw4 enabled with hdf5 and zfp compression features
    @andersp
    andersp authored Mar 27, 2023
    Configuration menu
    Copy the full SHA
    c97c9a6 View commit details
    Browse the repository at this point in the history

  3. Disable omp pragma for sfileoutput

    @houjun
    houjun committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    fd744ab View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. Fix a sw4mopt issue when having multiple events

    @houjun
    houjun committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    a4489f0 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. Merge pull request #179 from geodynamics/tang/hdf5bugfix 

    Fix a couple of bugs
    @andersp
    andersp authored Apr 5, 2023
    Configuration menu
    Copy the full SHA
    5170a68 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. Remove unnecessary string that causes segfault on Perlmutter

    @houjun
    houjun committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    dfc9ac4 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Merge pull request #180 from geodynamics/tang/hdf5bugfix 

    Remove unnecessary string that causes segfault on Perlmutter
    @andersp
    andersp authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    efbf019 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Fix a bug with ssiouput z coordinates write

    @houjun
    houjun committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    f0c9d6e View commit details
    Browse the repository at this point in the history

  2. Flush z coordinates to file immediately

    @houjun
    houjun committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    8fe97ab View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Merge pull request #189 from geodynamics/tang/hdf5bugfix 

    Fix a bug with ssiouput z coordinates write
    @andersp
    andersp authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    bc8fb89 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Fix an issue with imageh5 when there are more than 1 curvilinear grid… 

    …s, update pytest Perlmutter run command
    @houjun
    houjun committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    934b090 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Merge pull request #191 from geodynamics/tang/imageh5fix 

    Fix an issue with imageh5
    @andersp
    andersp authored Jul 5, 2023
    Configuration menu
    Copy the full SHA
    a63d798 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge branch 'master' into mergemaster

    @houjun
    houjun committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    0c60d5d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #194 from geodynamics/mergemaster 

    Sync changes from master to developer
    @andersp
    andersp authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    260d714 View commit details
    Browse the repository at this point in the history