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

Trapping 3-way merge #459

Open
wants to merge 55 commits into
base: master
Choose a base branch
from
Open

Trapping 3-way merge #459

wants to merge 55 commits into from

Commits on Jan 11, 2022

  1. Made a new branch where the generalized trapping SINDy work will go.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    312f0c2 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2022

  1. Added example 16 with all the new trapping investigations

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Feb 14, 2022
    Configuration menu
    Copy the full SHA
    2478bd4 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2022

  1. Still working on trapping example.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    7eaf249 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2022

  1. Added some more changes. Going to merge the main branch in

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Feb 20, 2022
    Configuration menu
    Copy the full SHA
    8da5db4 View commit details
    Browse the repository at this point in the history

  2. Merged in the main branch.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Feb 20, 2022
    Configuration menu
    Copy the full SHA
    95217b1 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2022

  1. Adding the new trapping examples, consolidated trapping SR3 algorithm… 

    …s into single file (and objective function), fixed some test errors, fixed issue where trapping algorithm Qijk piece was slightly off (and reran notebooks).
    Alan Kaptanoglu committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    b4b53a1 View commit details
    Browse the repository at this point in the history

  2. Deleted the older trapping generalized sr3 file, and think I fixed th… 

    …e pytest issues.
    Alan Kaptanoglu committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    5be87a2 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2022

  1. Still working on getting some of the new trapping loss functions work… 

    …ing.
    user01 authored and user01 committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    675fa06 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2022

  1. Added new file to get Mai started on this branch. Merging in main bra… 

    …nch in a moment.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    b326ccb View commit details
    Browse the repository at this point in the history

  2. merged in the main branch

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    7abb697 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2022

  1. Cleaned up a notebook for Mai to work on.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    e5ad333 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2023

  1. PT_ added and fix the PQ_tensor

    @MPeng5
    MPeng5 committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    483f8f4 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. Committing current version of the trapping notebook so I can move to … 

    …lambda machine. Rerunning the 9 mode von karman example is too intensive for my computer.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    695af36 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. P modified for continuing working on the optimizer

    Mai Peng authored and Mai Peng committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    ba435e0 View commit details
    Browse the repository at this point in the history

  2. P modified to work on the optimizer

    Mai Peng authored and Mai Peng committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    51bfc4e View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. some TODOs updated, follow the TODOs

    @MPeng5
    MPeng5 committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    7c11d12 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into trapping_extended

    @MPeng5
    MPeng5 committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    e15a07e View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. modified optimizer now works for Lorenz and MHD model, wait for poten… 

    …tial fix for Von Karman street
    @MPeng5
    MPeng5 committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    1f00e03 View commit details
    Browse the repository at this point in the history

  2. fix PT check

    @MPeng5
    MPeng5 committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    0742399 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. Simplified and reran the trapping notebook, which is looking good. Al… 

    …so cleaned up the linting in trapping_sr3.py
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    7f307fc View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2023

  1. updated stability check in notebook

    @MPeng5
    MPeng5 committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    e7ecae1 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. Fixed some bugs. Continue to work on the radius next week

    @MPeng5
    MPeng5 committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    831d15e View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. updated the definition for constraints

    @MPeng5
    MPeng5 committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    7f0d95a View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Merge branch 'trapping_extended' of https://github.com/dynamicslab/py… 

    …sindy into trapping_extended
    Mai Peng authored and Mai Peng committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    80d3c92 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. fixed small bugs in _reduce

    @MPeng5
    MPeng5 committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    631c51e View commit details
    Browse the repository at this point in the history

  2. tried with suitable beta values

    @MPeng5
    MPeng5 committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    187eb67 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. added stability radius drawing after 'soft constraint'

    @MPeng5
    MPeng5 committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    77baf32 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Merge branch 'trapping_extended' of https://github.com/dynamicslab/py… 

    …sindy into trapping_extended
    Mai Peng authored and Mai Peng committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    023744e View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. Added a fix to the soft constraints functionality. Issue was the resh… 

    …aping format needs to be fortran style. Added some of the examples from the dysts database, some of which dont seem to quite be behaving -- need to look closer at these. Importantly, added functionality in the code and in the example for including a bias (constant) term in the dynamical equations.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    6178df9 View commit details
    Browse the repository at this point in the history

  2. Think I fixed the sphinx issue and added unit tests for python3.9 to … 

    …the repository
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    d31556c View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2023

  1. added a projection operator for the bias term

    @MPeng5
    MPeng5 committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    330a28d View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. fixed a bug in the optimizer. Continue to work on the notebook

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

  2. Merge branch 'trapping_extended' of https://github.com/dynamicslab/py… 

    …sindy into trapping_extended
    Mai Peng authored and Mai Peng committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    3106d8c View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. Updated the example 16 notebook for the enstrophy.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    bad090d View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Merge branch 'trapping_extended' of https://github.com/dynamicslab/py… 

    …sindy into trapping_extended
    Mai Peng authored and Mai Peng committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    1d27108 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. fixed the stability radius and continue work on the notebook on Friday

    @MPeng5
    MPeng5 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    902bf57 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trapping_extended' of https://github.com/dynamicslab/py… 

    …sindy into trapping_extended
    Mai Peng authored and Mai Peng committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    7a63b2c View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. local stability radius well defined. More examples to show

    @MPeng5
    MPeng5 committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    c68b873 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trapping_extended' of https://github.com/dynamicslab/py… 

    …sindy into trapping_extended
    Mai Peng authored and Mai Peng committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    0d90a86 View commit details
    Browse the repository at this point in the history

  3. Removed TODOs

    Mai Peng authored and Mai Peng committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    5adc7f0 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Updated some plots

    Mai Peng authored and Mai Peng committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    78b4645 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2023

  1. Renamed and reorganized some scripts. Added the von karman example us… 

    …ing the enstrophy in the trapping theorem and split up the dysts examples into a separate script to make things easier to use.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    2efe993 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trapping_extended' of https://github.com/dynamicslab/py… 

    …sindy into trapping_extended
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    ba71846 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. Reorganized the trapping files under a single directory 8_trapping_si… 

    …ndy_examples/. Now includes four jupyter notebooks, for the local stability, for dysts and lid-cavity flow examples, for using the enstrophy with the trapping theorem, and for the original trapping SINDy paper notebook. Added all the mutual functions to the trapping_utils file.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    3ec8481 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. cleaned repeating variables/definitions in functions

    @MPeng5
    MPeng5 committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    4327510 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Added the plot of trapping region of Lorenze. Renamed some of the fun… 

    …ctions
    @MPeng5
    MPeng5 committed May 9, 2023
    Configuration menu
    Copy the full SHA
    46ac661 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. Added noise to the Lorenz example. Need to fix the std

    @MPeng5
    MPeng5 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    7358911 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. A contour of the evolution of the kinetic energy of 2d globally stabl… 

    …e system was added. More to add and polish in the future
    Mai Peng authored and Mai Peng committed May 23, 2023
    Configuration menu
    Copy the full SHA
    6c66c97 View commit details
    Browse the repository at this point in the history

  2. More levels added

    Mai Peng authored and Mai Peng committed May 23, 2023
    Configuration menu
    Copy the full SHA
    e9d64c9 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Updating notebook but not done comparing the lorenz noisy data perfor… 

    …mance.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    6aa3e76 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2023

  1. Played around with the enstrophy version of the trapping theorem and … 

    …think we have some bugs left. The global version is still imposing the constraints on Q instead of on PQ. I think I fixed this for the local version but now not getting reasonably results, so probably there are bugs in both.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    59a335b View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. when check stability, print out the max deviation from having zero to… 

    …tally symmetric part as well
    @MPeng5
    MPeng5 committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    e956ce7 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. fixed the trap_progress_plots: legend 'unstable -> possibly unstable'

    @MPeng5
    MPeng5 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    497de09 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2023

  1. updated some results

    @MPeng5
    MPeng5 committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    8d46f27 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Merge remote-tracking branch 'origin/trapping_extended' into trapping… 

    …-merge
    @Jacob-Stevens-Haas
    Jacob-Stevens-Haas committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    4617a51 View commit details
    Browse the repository at this point in the history