Skip to content

Instantly share code, notes, and snippets.

View zbeekman's full-sized avatar
🏢
New Office, still neck deep in code

Izaak "Zaak" Beekman zbeekman

🏢
New Office, still neck deep in code
View GitHub Profile
@zbeekman
zbeekman / json_module.diff
Created March 11, 2015 04:33
Diff showing changes to enable unicode support
diff --git a/src/json_module.F90 b/src/json_module.F90
index 3986a22..a3094a4 100644
--- a/src/json_module.F90
+++ b/src/json_module.F90
@@ -120,12 +120,75 @@
! CK
!
! DESCRIPTION
- ! Default character kind.
- ! This is 1 byte for the Intel and Gfortran compilers
@zbeekman
zbeekman / json-fortran.rb
Last active August 29, 2015 14:21
WIP: homebrew formula for json-fortran
class JsonFortran < Formula
desc "A Fortran 2008 JSON API"
homepage "https://github.com/jacobwilliams/json-fortran"
url "https://github.com/jacobwilliams/json-fortran/archive/4.1.1.tar.gz"
sha256 "97f258d28536035ef70e9ead5c7053e654106760a12db2cc652587ed61b76124"
head "https://github.com/jacobwilliams/json-fortran.git"
option "with-unicode-support", "Build json-fortran to support unicode text in json objects and files"
option "without-test", "Skip running build-time tests (not recommended)"
@zbeekman
zbeekman / FLAP makefile problem
Created June 25, 2015 20:31
FLAP makefile problem
$ make
Compiling IR_Precision.F90
Compiling Data_Type_Command_Line_Interface.F90
Compiling Test_Driver.f90
Assembling Test_Driver/TEST_DRIVER
duplicate symbol ___data_type_command_line_interface_MOD___copy_LOGICAL_4_ in:
Test_Driver/obj/Data_Type_Command_Line_Interface.o
Test_Driver/obj/data_type_command_line_interface.o
duplicate symbol ___data_type_command_line_interface_MOD___copy_INTEGER_1_ in:
Test_Driver/obj/Data_Type_Command_Line_Interface.o
-: 0:Source:/Users/ibeekman/Sandbox/json-fortran/src/json_module.F90
-: 0:Graph:CMakeFiles/jsonfortran.dir/src/json_module.F90.gcno
-: 0:Data:CMakeFiles/jsonfortran.dir/src/json_module.F90.gcda
-: 0:Runs:11
-: 0:Programs:1
-: 1:!*****************************************************************************************
-: 2:!> author: Jacob Williams
-: 3:! license: BSD
-: 4:!
-: 5:!# JSON-Fortran:

Coverage analysis of json_module.F90

Metrics Analysis
Number of executable lines 1458
Number of executed lines 1192 82%
Number of unexecuted lines 266 18%
Number of average hits per executed lines 329899
Number of procedures 162
Number of executed procedures 0 0%
#!/usr/bin/env python
import sys
import os
import string
MERGE = "emacs"
QFLAG = "-Q"
EVAL = "--eval"
EVALFUNC = ["ediff-merge-files-with-ancestor"]
(ediff-merge-files-with-ancestor file-a file-b file-ancestor &optional
startup-hooks merge-buffer-file)
diff --git a/master:CAF_API.txt b/branch-1.0.0:CAF_ABI.txt
index 39fe7cf..c2d6898 100644
--- a/master:CAF_API.txt
+++ b/branch-1.0.0:CAF_ABI.txt
@@ -1,83 +1,74 @@
-DRAFT DOCUMENT FOR A COARRAY API DEFINTION
+[This document is formatted with GitHub-Flavored Markdown. ]:#
+[For better viewing, including hyperlinks, read it online at ]:#
+[https://github.com/sourceryinstitute/opencoarrays/blob/master/CAF_API.md]:#
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c11a85d..02d7f94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0)
#Name project and specify source languages
-project(opencoarrays VERSION 2.0.0 LANGUAGES C Fortran)
+project(opencoarrays VERSION 1.2.2 LANGUAGES C Fortran)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c11a85d..02d7f94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0)
#Name project and specify source languages
-project(opencoarrays VERSION 2.0.0 LANGUAGES C Fortran)
+project(opencoarrays VERSION 1.2.2 LANGUAGES C Fortran)