Code

WIP: Better matrix support#426

Code

Open

zbeekman wants to merge 32 commits intojacobwilliams:masterjacobwilliams/json-fortran:masterfrom nrc-fuels:add_matrix_supportnrc-fuels/json-fortran:add_matrix_supportCopy head branch name to clipboard

+1,113-148

Commits

Commits on Aug 14, 2018

• WIP: Interface for matrix calls

  porteri

  committed
  ac0c9a4

  Copy full SHA for ac0c9a4

• WIP: matrix test

  porteri

  committed
  a94db82

  Copy full SHA for a94db82

• Can get 2d matrix and array of matrices

  porteri

  committed
  0b570b5

  Copy full SHA for 0b570b5

• Removed write statement

  porteri

  committed
  2e6c559

  Copy full SHA for 2e6c559

• Added ability to determine supplied array lengths

  Show description for 2d81c1b
  porteri

  committed
  2d81c1b

  Copy full SHA for 2d81c1b

• Print test output on failure with check target

  zbeekman

  committed
  8ac9898

  Copy full SHA for 8ac9898

• WIP: Found issue with new logic

  porteri

  committed
  80a1d1d

  Copy full SHA for 80a1d1d

Commits on Aug 31, 2018

• Write format issue fix

  porteri

  committed
  1b60c8d

  Copy full SHA for 1b60c8d

Commits on Sep 3, 2018

• Fix bad JSON in test

  zbeekman

  committed
  5e9cebb

  Copy full SHA for 5e9cebb

Commits on Sep 27, 2018

• Merge branch 'master' into add_matrix_support

  zbeekman

  committed
  c1e5bd3

  Copy full SHA for c1e5bd3

Commits on Nov 16, 2018

• Merge branch 'master' into add_matrix_support

  Show description for 2760dfb
  zbeekman

  committed
  2760dfb

  Copy full SHA for 2760dfb

Commits on Feb 16, 2019

• Fix for undefined variable in test#26

  Show description for f4d7edc
  

  Ian Porter

  authored and

  Ian Porter

  committed
  f4d7edc

  Copy full SHA for f4d7edc

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

  Show description for d0a9718
  porteri

  authored
  d0a9718

  Copy full SHA for d0a9718

• Merge branch 'master' into add_matrix_support

  

  Ian Porter

  authored and

  Ian Porter

  committed
  d99c2ae

  Copy full SHA for d99c2ae

• Merge fix

  

  Ian Porter

  authored and

  Ian Porter

  committed
  20f7059

  Copy full SHA for 20f7059

Commits on Mar 29, 2019

• Merge branch 'master' of github.com:jacobwilliams/json-fortran into add_matrix_support

  zbeekman

  committed
  34a446e

  Copy full SHA for 34a446e

Commits on Mar 30, 2019

• Only install module files, not config dir with IDE

  Show description for 0bf4831
  zbeekman

  committed
  0bf4831

  Copy full SHA for 0bf4831

• Merge branch 'module_install_w_IDEs' of github.com:zbeekman/json-fortran into add_matrix_support

  zbeekman

  committed
  ce9c43b

  Copy full SHA for ce9c43b

Commits on Apr 5, 2019

• Revert "Merge branch 'module_install_w_IDEs' of github.com:zbeekman/json-fortran into add_matrix_support"

  Show description for f582c41
  zbeekman

  committed
  f582c41

  Copy full SHA for f582c41

• Merge branch 'module_install_w_IDEs' into add_matrix_support

  zbeekman

  committed
  cb0838d

  Copy full SHA for cb0838d

Commits on Jun 20, 2019

• Add option to build and link against OpenCoarrays

  zbeekman

  committed
  d3de9dd

  Copy full SHA for d3de9dd

Commits on Jul 22, 2019

• Merge tag '7.1.0' of github.com:jacobwilliams/json-fortran into add_matrix_support

  zbeekman

  committed
  1a478b7

  Copy full SHA for 1a478b7

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

  zbeekman

  committed
  414003e

  Copy full SHA for 414003e

• Testing: Use CTest fixtures to manipulate files

  Show description for acf4659
  zbeekman

  committed
  acf4659

  Copy full SHA for acf4659

Commits on Jul 25, 2019

• Merge branch 'master' of github.com:jacobwilliams/json-fortran into add_matrix_support

  zbeekman

  committed
  64f1fea

  Copy full SHA for 64f1fea

• Fix matrix test name clashes

  zbeekman

  committed
  2f4354b

  Copy full SHA for 2f4354b

• CMake: Remove extra instance of OC linking option

  zbeekman

  committed
  c80d070

  Copy full SHA for c80d070

Commits on Aug 1, 2019

• Allow ragged edge matrices in matrix_infos

  Show description for 1c46747
  zbeekman

  committed
  1c46747

  Copy full SHA for 1c46747

Commits on Aug 5, 2019

• WIP: Transfering from laptop to work machine

  zbeekman

  committed
  0a12758

  Copy full SHA for 0a12758

• WIP: Commit unsaved changes to move from laptop

  zbeekman

  committed
  c3bdf40

  Copy full SHA for c3bdf40

Commits on Aug 6, 2019

• Remove errant string matrix overloads/interfaces

  zbeekman

  committed
  ede35d2

  Copy full SHA for ede35d2

Commits on Nov 2, 2022

• Updating to remove json tests for Windows as a temporary workaround before json is removed from FAST

  dcolameco

  committed
  7ee642b

  Copy full SHA for 7ee642b