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: Better matrix support #426

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

WIP: Better matrix support #426

wants to merge 32 commits into from

Commits on Aug 14, 2018

  1. WIP: Interface for matrix calls

    @porteri
    porteri committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    ac0c9a4 View commit details
    Browse the repository at this point in the history

  2. WIP: matrix test

    @porteri
    porteri committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    a94db82 View commit details
    Browse the repository at this point in the history

  3. Can get 2d matrix and array of matrices

    @porteri
    porteri committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    0b570b5 View commit details
    Browse the repository at this point in the history

  4. Removed write statement

    @porteri
    porteri committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    2e6c559 View commit details
    Browse the repository at this point in the history

  5. Added ability to determine supplied array lengths 

    An optional argument was added that provides the # of values from the
json file for each row within the matrix. This allows the user to more
easily know if not all of the rows had the same number of columns.
    @porteri
    porteri committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    2d81c1b View commit details
    Browse the repository at this point in the history

  6. Print test output on failure with check target

    @zbeekman
    zbeekman committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    8ac9898 View commit details
    Browse the repository at this point in the history

  7. WIP: Found issue with new logic

    @porteri
    porteri committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    80a1d1d View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2018

  1. Write format issue fix

    @porteri
    porteri committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    1b60c8d View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2018

  1. Fix bad JSON in test

    @zbeekman
    zbeekman committed Sep 3, 2018
    Configuration menu
    Copy the full SHA
    5e9cebb View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2018

  1. Merge branch 'master' into add_matrix_support

    @zbeekman
    zbeekman committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    c1e5bd3 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2018

  1. Merge branch 'master' into add_matrix_support 

     - Update with latest upstream enhancements 6.9.0 --> 6.10.0
    @zbeekman
    zbeekman committed Nov 16, 2018
    Configuration menu
    Copy the full SHA
    2760dfb View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2019

  1. Fix for undefined variable in test#26 

    Fixes the undefined variable error_cnt for test jacobwilliams#26 when the json%validate returns a true is_valid statement.
    Ian Porter authored and Ian Porter committed Feb 16, 2019
    Configuration menu
    Copy the full SHA
    f4d7edc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from nrc-fuels/fix_failing_test 

    Fix for undefined variable in test#26
    @porteri
    porteri authored Feb 16, 2019
    Configuration menu
    Copy the full SHA
    d0a9718 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into add_matrix_support

    Ian Porter authored and Ian Porter committed Feb 16, 2019
    Configuration menu
    Copy the full SHA
    d99c2ae View commit details
    Browse the repository at this point in the history

  4. Merge fix

    Ian Porter authored and Ian Porter committed Feb 16, 2019
    Configuration menu
    Copy the full SHA
    20f7059 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2019

  1. Merge branch 'master' of github.com:jacobwilliams/json-fortran into a… 

    …dd_matrix_support
    @zbeekman
    zbeekman committed Mar 29, 2019
    Configuration menu
    Copy the full SHA
    34a446e View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2019

  1. Only install module files, not config dir with IDE 

     - MSVS will install, e.g., `$<prefix>/include/Debug/json_file_module.mod`
 - We should strip the build config directory that IDEs like MSVS add when doing an installation
    @zbeekman
    zbeekman committed Mar 30, 2019
    Configuration menu
    Copy the full SHA
    0bf4831 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'module_install_w_IDEs' of github.com:zbeekman/json-fort… 

    …ran into add_matrix_support
    @zbeekman
    zbeekman committed Mar 30, 2019
    Configuration menu
    Copy the full SHA
    ce9c43b View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2019

  1. Revert "Merge branch 'module_install_w_IDEs' of github.com:zbeekman/j… 

    …son-fortran into add_matrix_support"

This reverts commit ce9c43b, reversing
changes made to 34a446e.
    @zbeekman
    zbeekman committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    f582c41 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'module_install_w_IDEs' into add_matrix_support

    @zbeekman
    zbeekman committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    cb0838d View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2019

  1. Add option to build and link against OpenCoarrays

    @zbeekman
    zbeekman committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    d3de9dd View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2019

  1. Merge tag '7.1.0' of github.com:jacobwilliams/json-fortran into add_m… 

    …atrix_support
    @zbeekman
    zbeekman committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    1a478b7 View commit details
    Browse the repository at this point in the history

  2. Move matrix test (40.f90) to 41.F90

    @zbeekman
    zbeekman committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    414003e View commit details
    Browse the repository at this point in the history

  3. Testing: Use CTest fixtures to manipulate files 

     - Fixes jacobwilliams#413
 - Use fixtures to delete old json outputs before re-running tests, then copy
   pristine inputs back into the build directory
    @zbeekman
    zbeekman committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    acf4659 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2019

  1. Merge branch 'master' of github.com:jacobwilliams/json-fortran into a… 

    …dd_matrix_support
    @zbeekman
    zbeekman committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    64f1fea View commit details
    Browse the repository at this point in the history

  2. Fix matrix test name clashes

    @zbeekman
    zbeekman committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    2f4354b View commit details
    Browse the repository at this point in the history

  3. CMake: Remove extra instance of OC linking option

    @zbeekman
    zbeekman committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    c80d070 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2019

  1. Allow ragged edge matrices in matrix_infos 

     - Add additional optional, intent out parameter, `is_uniform`
   - `.true.` for regular matrices
   - `.false.` for ragged edge matrices
 - The idea is to allow trailing zeros to be compressed/elided (eventually)
 - The `set_size` dummy argument was renamed to `mx_set_size` and records the
   largest column size, assuming __*row* major order__
    @zbeekman
    zbeekman committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    1c46747 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2019

  1. WIP: Transfering from laptop to work machine

    @zbeekman
    zbeekman committed Aug 5, 2019
    Configuration menu
    Copy the full SHA
    0a12758 View commit details
    Browse the repository at this point in the history

  2. WIP: Commit unsaved changes to move from laptop

    @zbeekman
    zbeekman committed Aug 5, 2019
    Configuration menu
    Copy the full SHA
    c3bdf40 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2019

  1. Remove errant string matrix overloads/interfaces

    @zbeekman
    zbeekman committed Aug 6, 2019
    Configuration menu
    Copy the full SHA
    ede35d2 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2022

  1. Updating to remove json tests for Windows as a temporary workaround b… 

    …efore json is removed from FAST
    @dcolameco
    dcolameco committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    7ee642b View commit details
    Browse the repository at this point in the history