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

WIP: Better matrix support #426

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
+1,113 −148
Open

WIP: Better matrix support #426

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ac0c9a4
WIP: Interface for matrix calls
porteri Aug 14, 2018
a94db82
WIP: matrix test
porteri Aug 14, 2018
0b570b5
Can get 2d matrix and array of matrices
porteri Aug 14, 2018
2e6c559
Removed write statement
porteri Aug 14, 2018
2d81c1b
Added ability to determine supplied array lengths
porteri Aug 14, 2018
8ac9898
Print test output on failure with check target
zbeekman Aug 14, 2018
80a1d1d
WIP: Found issue with new logic
porteri Aug 14, 2018
1b60c8d
Write format issue fix
porteri Aug 31, 2018
5e9cebb
Fix bad JSON in test
zbeekman Sep 3, 2018
c1e5bd3
Merge branch 'master' into add_matrix_support
zbeekman Sep 27, 2018
2760dfb
Merge branch 'master' into add_matrix_support
zbeekman Nov 16, 2018
f4d7edc
Fix for undefined variable in test#26
Feb 16, 2019
d0a9718
Merge pull request #2 from nrc-fuels/fix_failing_test
porteri Feb 16, 2019
d99c2ae
Merge branch 'master' into add_matrix_support
Feb 16, 2019
20f7059
Merge fix
Feb 16, 2019
34a446e
Merge branch 'master' of github.com:jacobwilliams/json-fortran into a…
zbeekman Mar 29, 2019
0bf4831
Only install module files, not config dir with IDE
zbeekman Mar 29, 2019
ce9c43b
Merge branch 'module_install_w_IDEs' of github.com:zbeekman/json-fort…
zbeekman Mar 30, 2019
f582c41
Revert "Merge branch 'module_install_w_IDEs' of github.com:zbeekman/j…
zbeekman Apr 5, 2019
cb0838d
Merge branch 'module_install_w_IDEs' into add_matrix_support
zbeekman Apr 5, 2019
d3de9dd
Add option to build and link against OpenCoarrays
zbeekman Jun 20, 2019
1a478b7
Merge tag '7.1.0' of github.com:jacobwilliams/json-fortran into add_m…
zbeekman Jul 22, 2019
414003e
Move matrix test (40.f90) to 41.F90
zbeekman Jul 22, 2019
acf4659
Testing: Use CTest fixtures to manipulate files
zbeekman Jul 22, 2019
64f1fea
Merge branch 'master' of github.com:jacobwilliams/json-fortran into a…
zbeekman Jul 25, 2019
2f4354b
Fix matrix test name clashes
zbeekman Jul 25, 2019
c80d070
CMake: Remove extra instance of OC linking option
zbeekman Jul 25, 2019
1c46747
Allow ragged edge matrices in `matrix_info`s
zbeekman Aug 1, 2019
0a12758
WIP: Transfering from laptop to work machine
zbeekman Aug 5, 2019
c3bdf40
WIP: Commit unsaved changes to move from laptop
zbeekman Aug 5, 2019
ede35d2
Remove errant string matrix overloads/interfaces
zbeekman Aug 6, 2019
7ee642b
Updating to remove json tests for Windows as a temporary workaround b…
dcolameco Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CMake: Remove extra instance of OC linking option
@zbeekman
zbeekman committed Jul 25, 2019
commit c80d070608a400ab3c44e9408ca39c581a8c387e
3 changes: 0 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -14,9 +14,6 @@ cmake_minimum_required ( VERSION 2.8.8 FATAL_ERROR )
# Use MSVS folders to organize projects on windows
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

option(JSON_FORTRAN_USE_OpenCoarrays
"Build VTKmofo with support for linking against OpenCoarray programs" OFF)

set(PROJECT_DESCRIPTION "A Fortran 2008 JSON API")
set(PROJECT_URL "https://github.com/jacobwilliams/json-fortran")