Skip to content

Commit d9d70e6

Browse files
dengwirdadengwirda
authored
Merge pull request #17 from dengwirda/dev
Update to jigsaw-1.0.0.x
2 parents f875719 + f05a61d commit d9d70e6

261 files changed

Lines changed: 44546 additions & 11331 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/setup.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: jigsaw-python tester
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
push:
7+
8+
jobs:
9+
build:
10+
runs-on: ${{ matrix.os }}
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
os: [ubuntu-latest, macos-latest, windows-latest]
15+
python-version: ["3.10"]
16+
17+
steps:
18+
- uses: actions/checkout@v3
19+
20+
- name: Print environment
21+
run: |
22+
echo github.event.action: ${{ github.event.action }}
23+
echo github.event_name: ${{ github.event_name }}
24+
25+
- name: Set up Python ${{ matrix.python-version }}
26+
uses: actions/setup-python@v4
27+
with:
28+
python-version: ${{ matrix.python-version }}
29+
30+
- name: Install dependencies on win
31+
if: startsWith(matrix.os, 'windows')
32+
run: |
33+
choco install ninja cmake
34+
ninja --version
35+
cmake --version
36+
37+
- name: Install dependencies on unx
38+
if: startsWith(matrix.os, 'ubuntu')
39+
run: |
40+
sudo apt-get update
41+
sudo apt-get install ninja-build cmake
42+
ninja --version
43+
cmake --version
44+
g++ --version
45+
46+
- name: Install dependencies on osx
47+
if: startsWith(matrix.os, 'macos')
48+
run: |
49+
brew install ninja cmake llvm libomp
50+
ninja --version
51+
cmake --version
52+
clang++ --version
53+
54+
- name: Install dependencies
55+
run: |
56+
python -m pip install --upgrade pip
57+
pip install -r requirements.txt
58+
59+
- name: Build jigsaw-python
60+
run: python setup.py build_external install
61+
62+
- name: Eval. jigsaw-python
63+
run: python example.py --IDnumber=-1

‎.travis.yml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎LICENSE.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,11 @@
22

33
This program may be freely redistributed under the condition that the copyright notices (including this entire header) are not removed, and no compensation is received through use of the software. Private, research, and institutional use is free. You may distribute modified versions of this code `UNDER THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR NOTICE IS GIVEN OF THE MODIFICATIONS`. Distribution of this code as part of a commercial system is permissible `ONLY BY DIRECT ARRANGEMENT WITH THE AUTHOR`. (If you are not directly supplying this code to a customer, and you are instead telling them how they can obtain it for free, then you are not required to make any arrangement with me.)
44

5-
`DISCLAIMER`: Neither I nor: Columbia University, the Massachusetts Institute of Technology, the University of Sydney, nor the National Aeronautics and Space Administration warrant this code in any way whatsoever. This code is provided "as-is" to be used at your own risk.
5+
`DISCLAIMER`: Neither I nor `THE CONTRIBUTORS` warrant this code in any way whatsoever. This code is provided "as-is" to be used at your own risk.
6+
7+
`THE CONTRIBUTORS` include:
8+
(a) The University of Sydney
9+
(b) The Massachusetts Institute of Technology
10+
(c) Columbia University
11+
(d) The National Aeronautics & Space Administration
12+
(e) Los Alamos National Laboratory

‎README.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,14 @@ Run `python3 example.py --IDnumber=N` to call the `N-th` example. `*.vtk` output
6464

6565
This program may be freely redistributed under the condition that the copyright notices (including this entire header) are not removed, and no compensation is received through use of the software. Private, research, and institutional use is free. You may distribute modified versions of this code `UNDER THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR NOTICE IS GIVEN OF THE MODIFICATIONS`. Distribution of this code as part of a commercial system is permissible `ONLY BY DIRECT ARRANGEMENT WITH THE AUTHOR`. (If you are not directly supplying this code to a customer, and you are instead telling them how they can obtain it for free, then you are not required to make any arrangement with me.)
6666

67-
`DISCLAIMER`: Neither I nor: Columbia University, the Massachusetts Institute of Technology, the University of Sydney, nor the National Aeronautics and Space Administration warrant this code in any way whatsoever. This code is provided "as-is" to be used at your own risk.
67+
`DISCLAIMER`: Neither I nor `THE CONTRIBUTORS` warrant this code in any way whatsoever. This code is provided "as-is" to be used at your own risk.
68+
69+
`THE CONTRIBUTORS` include:
70+
(a) The University of Sydney
71+
(b) The Massachusetts Institute of Technology
72+
(c) Columbia University
73+
(d) The National Aeronautics & Space Administration
74+
(e) Los Alamos National Laboratory
6875

6976
### `References`
7077

‎example.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ def example(IDnumber=0):
5353
elif (IDnumber == +8):
5454
case_8_(src_path, dst_path)
5555

56+
elif (IDnumber == -1):
57+
for i in range(9): example(i)
58+
5659
return
5760

5861

@@ -61,7 +64,7 @@ def example(IDnumber=0):
6164
description=__doc__, formatter_class=argparse.RawTextHelpFormatter)
6265

6366
parser.add_argument("--IDnumber", dest="IDnumber", type=int,
64-
required=True, help="Run example with ID = (0-9).")
67+
required=True, help="Run example with ID = (0-8).")
6568

6669
args = parser.parse_args()
6770

‎external/jigsaw/.github/workflows/cmake.yml‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
name: CMake Build Matrix
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
push:
7+
8+
env:
9+
BUILD_TYPE: Debug
10+
11+
jobs:
12+
build:
13+
name: ${{ matrix.config.name }}
14+
runs-on: ${{ matrix.config.os }}
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
config:
19+
- {
20+
name: "Windows Latest MSVC", artifact: "Windows-MSVC.tar.xz",
21+
os: windows-latest,
22+
cc: "cl", cxx: "cl"
23+
}
24+
- {
25+
name: "Ubuntu Latest GCC", artifact: "Linux.tar.xz",
26+
os: ubuntu-latest,
27+
cc: "gcc", cxx: "g++"
28+
}
29+
- {
30+
name: "macOS Latest Clang", artifact: "macOS.tar.xz",
31+
os: macos-latest,
32+
cc: "clang", cxx: "clang++"
33+
}
34+
35+
steps:
36+
- uses: actions/checkout@v3
37+
38+
- name: Print environment
39+
run: |
40+
echo github.event.action: ${{ github.event.action }}
41+
echo github.event_name: ${{ github.event_name }}
42+
43+
- name: Install dependencies on win
44+
if: startsWith(matrix.config.os, 'windows')
45+
run: |
46+
choco install ninja cmake
47+
ninja --version
48+
cmake --version
49+
50+
- name: Install dependencies on unx
51+
if: startsWith(matrix.config.name, 'ubuntu')
52+
run: |
53+
sudo apt-get update
54+
sudo apt-get install ninja-build cmake
55+
ninja --version
56+
cmake --version
57+
g++ --version
58+
59+
- name: Install dependencies on osx
60+
if: startsWith(matrix.config.os, 'macos')
61+
run: |
62+
brew install ninja cmake llvm libomp
63+
ninja --version
64+
cmake --version
65+
clang++ --version
66+
67+
- name: Configure jigsaw
68+
run: |
69+
mkdir ${{github.workspace}}/build
70+
cd ${{github.workspace}}/build
71+
cmake .. -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
72+
73+
- name: Build jigsaw
74+
run: |
75+
cd ${{github.workspace}}/build
76+
cmake --build . --config ${{env.BUILD_TYPE}} --target install
77+
78+
- name: Clean jigsaw
79+
run: rm -r ${{github.workspace}}/build
80+
81+
- name: Configure tests for jigsaw
82+
run: |
83+
mkdir ${{github.workspace}}/uni/build
84+
cd ${{github.workspace}}/uni/build
85+
cmake .. -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
86+
87+
- name: Build tests for jigsaw
88+
run: |
89+
cd ${{github.workspace}}/uni/build
90+
cmake --build . --config ${{env.BUILD_TYPE}} --target install
91+
92+
- name: Prep. tests for jigsaw
93+
if: startsWith(matrix.config.os, 'windows')
94+
run: |
95+
cd ${{github.workspace}}/uni
96+
cp ../lib/jigsaw.dll .
97+
98+
- name: Eval. tests for jigsaw
99+
run: |
100+
cd ${{github.workspace}}/uni
101+
./test_all
102+
103+
- name: Extra tests for jigsaw
104+
run: |
105+
cd ${{github.workspace}}
106+
./bin/jigsaw example.jig
107+
./bin/jigsaw geo/airfoil.jig
108+
./bin/jigsaw geo/bunny.jig
109+
./bin/jigsaw geo/parts.jig
110+
./bin/jigsaw geo/earth.jig
111+
./bin/jigsaw geo/lakes.jig
112+
113+
- name: Clean tests for jigsaw
114+
run: rm -r ${{github.workspace}}/uni/build

‎external/jigsaw/.travis.yml‎

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎external/jigsaw/LICENSE.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,11 @@
22

33
This program may be freely redistributed under the condition that the copyright notices (including this entire header) are not removed, and no compensation is received through use of the software. Private, research, and institutional use is free. You may distribute modified versions of this code `UNDER THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR NOTICE IS GIVEN OF THE MODIFICATIONS`. Distribution of this code as part of a commercial system is permissible `ONLY BY DIRECT ARRANGEMENT WITH THE AUTHOR`. (If you are not directly supplying this code to a customer, and you are instead telling them how they can obtain it for free, then you are not required to make any arrangement with me.)
44

5-
`DISCLAIMER`: Neither I nor: Columbia University, the Massachusetts Institute of Technology, the University of Sydney, nor the National Aeronautics and Space Administration warrant this code in any way whatsoever. This code is provided "as-is" to be used at your own risk.
5+
`DISCLAIMER`: Neither I nor `THE CONTRIBUTORS` warrant this code in any way whatsoever. This code is provided "as-is" to be used at your own risk.
6+
7+
`THE CONTRIBUTORS` include:
8+
(a) The University of Sydney
9+
(b) The Massachusetts Institute of Technology
10+
(c) Columbia University
11+
(d) The National Aeronautics & Space Administration
12+
(e) Los Alamos National Laboratory

0 commit comments

Comments
 (0)