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

Update develop branch with main #284

Merged
merged 67 commits into from
May 3, 2024
Merged

Update develop branch with main #284

merged 67 commits into from
May 3, 2024

Commits on May 31, 2023

  1. add pyproject.toml to download packages prior to build

    @ACea15
    ACea15 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    c5786dc View commit details
    Browse the repository at this point in the history

  2. minimal env (only for people without low level libraries in system)

    @ACea15
    ACea15 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    fb40764 View commit details
    Browse the repository at this point in the history

  3. less restricted cmake in the setup (>= added)

    @ACea15
    ACea15 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    70b8b18 View commit details
    Browse the repository at this point in the history

  4. add functions to setup to build submodules

    @ACea15
    ACea15 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    330ef4e View commit details
    Browse the repository at this point in the history

  5. add required packages to pip install

    @ACea15
    ACea15 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    216bd5b View commit details
    Browse the repository at this point in the history

  6. remove unnecessary environments (leaving newer for reference)

    @ACea15
    ACea15 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    a9c3194 View commit details
    Browse the repository at this point in the history

  7. add option, via environment variable, to not build submodules

    @ACea15
    ACea15 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    85a4475 View commit details
    Browse the repository at this point in the history

  8. fix to env for Ubuntu

    @ACea15
    ACea15 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    d0ee119 View commit details
    Browse the repository at this point in the history

  9. fix wrong location of variable this_directory in merging conflicts

    @ACea15
    ACea15 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    780714b View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. simple compilation from run() method

    @ACea15
    ACea15 committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    a8d5884 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. minor environment compatibility for macos

    @ACea15
    ACea15 committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    1b0f8af View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. fix [savedata] save of linear system related hdf5 file saves 

    - fix intend otherwise these linear/rom systems would only be saved if no data.h5 file exist from the start
- remove all files before it is written as overwriting them causes an Assertation error
    @sduess
    sduess committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    4c4fb48 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Merge branch 'develop' into dev_pip2

    @ben-l-p
    ben-l-p committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    4937efe View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. fix [gust] type and handling of gust component definitions

    @sduess
    sduess committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    3bdabed View commit details
    Browse the repository at this point in the history

  2. Revert "fix [gust] type and handling of gust component definitions" 

    This reverts commit 3bdabed.
    @sduess
    sduess committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    bf3e295 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. fix [modalutils] number of modes to be exported as vtk 

    In the previous version, less modes are extracted for free flying aircraft because number of rigid body DoFs are wrongly substracted from the total number of modes although the first modes (which are the rigid body modes) are already skipped. Thus if 30 modes are to be exported only 10 mode shapes are created.
    @sduess
    sduess committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    db36db5 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Merge pull request #271 from ImperialCollegeLondon/fix_xbeam_optimise 

    Update XBeam version to include compiler optimisation
    @sduess
    sduess committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    5aa25e3 View commit details
    Browse the repository at this point in the history

  2. fix [udp tutorial] jupyter notebook meta data 

    - caused error in opening the jupyter notebook and for the  tutorial not to be displayed in the readthedocs documentation
    @sduess
    sduess committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    ecf6d60 View commit details
    Browse the repository at this point in the history

  3. remove [postproc] left over prints from debugging

    @sduess
    sduess committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    261204a View commit details
    Browse the repository at this point in the history

  4. remove [postproc] unused columns from exported force and moment matrices 

    - before it creates an output file with extra columns without any values
    @sduess
    sduess committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    501f73e View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2023

  1. Merge branch 'main' into gla_system

    @sduess
    sduess committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    c86e23d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into gla_system

    @sduess
    sduess committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    f6a01ac View commit details
    Browse the repository at this point in the history

  3. Merge pull request #273 from ImperialCollegeLondon/gla_system 

    A few minor bug fixes
    @sduess
    sduess committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    029fe56 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Update noaero.py for consistency in function input 

    NoAero errors out because of missing optional input - fixed
    @kccwing
    kccwing committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    d03a99b View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Fix in NoAero Solver 

    Update noaero.py for consistency in function input
    @sduess
    sduess committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    9cdb599 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Add scipy version info to env yml

    Sam Lane committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    fe0c5d7 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Added documentation for pip install 

    Also fixed an issue with SHARPy not running due to a package import error.
    @ben-l-p
    ben-l-p committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    6529a26 View commit details
    Browse the repository at this point in the history

  2. Remove conda/mambda from Github workflow

    @ben-l-p
    ben-l-p committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    f390ea0 View commit details
    Browse the repository at this point in the history

  3. Update dockerfile to remove mamba/conda dependency

    @ben-l-p
    ben-l-p committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    4514dea View commit details
    Browse the repository at this point in the history

  4. Added CMake install to Dockerfile

    @ben-l-p
    ben-l-p committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    52a282e View commit details
    Browse the repository at this point in the history

  5. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    fccaf87 View commit details
    Browse the repository at this point in the history

  6. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    de8c9ec View commit details
    Browse the repository at this point in the history

  7. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    4b853cf View commit details
    Browse the repository at this point in the history

  8. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    fa2814a View commit details
    Browse the repository at this point in the history

  9. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    75e3060 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    64e1e68 View commit details
    Browse the repository at this point in the history

  2. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    c986f46 View commit details
    Browse the repository at this point in the history

  3. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    b32b3a4 View commit details
    Browse the repository at this point in the history

  4. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    c1bbc79 View commit details
    Browse the repository at this point in the history

  5. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    00ceec2 View commit details
    Browse the repository at this point in the history

  6. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    3f922bc View commit details
    Browse the repository at this point in the history

  7. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    47cd979 View commit details
    Browse the repository at this point in the history

  8. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    da725ce View commit details
    Browse the repository at this point in the history

  9. Update Dockerfile

    @ben-l-p
    ben-l-p committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    03a4d0f View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Return Dockerfile to using conda/mamba

    @ben-l-p
    ben-l-p committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    226a6b7 View commit details
    Browse the repository at this point in the history

  2. Update installation.md

    @ben-l-p
    ben-l-p committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    eb32df5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ImperialCollegeLondon:main' into dev_pip2

    @ben-l-p
    ben-l-p committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    04294e0 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2024

  1. Added note about different pip install options

    @ben-l-p
    ben-l-p committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    ce51ac7 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Use latest mayavi from Github 

    No longer using "pip install mayavi" as this had build errors depending on python version (known bug)
    @ben-l-p
    ben-l-p committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e33d2cc View commit details
    Browse the repository at this point in the history

  2. Changed docs to include auto built, added ARM64 Conda environment

    @ben-l-p
    ben-l-p committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    6540174 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Small documentation update

    @ben-l-p
    ben-l-p committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    03928aa View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Changed docs to use --user flag as default for installation

    @ben-l-p
    ben-l-p committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    4e1e22a View commit details
    Browse the repository at this point in the history

  2. Added a few more install dependencies to the docs

    @ben-l-p
    ben-l-p committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    2441ee1 View commit details
    Browse the repository at this point in the history

  3. Update installation.md 

    Working like a charm on Debian 12, so I've updated the version in the docs.
    @rafapalacios
    rafapalacios committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    719dcfa View commit details
    Browse the repository at this point in the history

  4. Merge pull request #277 from SJ-Innovation/fix_env_version_info 

    Hotfix: Add scipy version info to env yml
    @kccwing
    kccwing committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    4be153b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ImperialCollegeLondon:main' into dev_pip2

    @ben-l-p
    ben-l-p committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    85b0392 View commit details
    Browse the repository at this point in the history

  6. Removed SciPy FFT fix - will add to another pull request

    @ben-l-p
    ben-l-p committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    646e5f0 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev_pip2' of https://github.com/ben-l-p/sharpy into dev… 

    …_pip2
    @ben-l-p
    ben-l-p committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    57dcbab View commit details
    Browse the repository at this point in the history

  8. Readded SciPy FFT changes

    @ben-l-p
    ben-l-p committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    906a566 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #280 from ben-l-p/dev_pip2 

    Added pip install (with docs)
    @ben-l-p
    ben-l-p committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    da05729 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Merge branch 'develop' into dev_main_conflict

    @ben-l-p
    ben-l-p committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    6f43046 View commit details
    Browse the repository at this point in the history

  2. Fix conflict in environment.yml

    @ben-l-p
    ben-l-p committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    8bd0eba View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. fixes for initialisation

    @kccwing
    kccwing committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    282cb31 View commit details
    Browse the repository at this point in the history

  2. Revert "fixes for initialisation" 

    This reverts commit 282cb31.
    @kccwing
    kccwing committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    017583b View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Fix Dockerfile to prevent Mamba install failing

    @ben-l-p
    ben-l-p committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    2c01874 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Merge pull request #285 from ImperialCollegeLondon/fix_docker_build 

    Fix Github Runner Docker build failing
    @kccwing
    kccwing committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    8d70685 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #286 from ImperialCollegeLondon/main 

    Update with main for mamba fixes
    @ben-l-p
    ben-l-p committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    8afb27d View commit details
    Browse the repository at this point in the history