Merge pull request #17 from dengwirda/dev

Update to jigsaw-1.0.0.x

.github/workflows/setup.yml

@@ -0,0 +1,63 @@
+name: jigsaw-python tester
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["3.10"]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Print environment
+        run: |
+          echo github.event.action: ${{ github.event.action }}
+          echo github.event_name: ${{ github.event_name }}
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies on win
+        if: startsWith(matrix.os, 'windows')
+        run: |
+          choco install ninja cmake
+          ninja --version
+          cmake --version
+          
+      - name: Install dependencies on unx
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build cmake
+          ninja --version
+          cmake --version
+          g++ --version
+          
+      - name: Install dependencies on osx
+        if: startsWith(matrix.os, 'macos')
+        run: |
+          brew install ninja cmake llvm libomp
+          ninja --version
+          cmake --version
+          clang++ --version
+          
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Build jigsaw-python
+        run: python setup.py build_external install
+
+      - name: Eval. jigsaw-python
+        run: python example.py --IDnumber=-1

LICENSE.md

@@ -2,4 +2,11 @@
 
 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.)
 
-`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.
+`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.
+
+`THE CONTRIBUTORS` include:
+(a) The University of Sydney
+(b) The Massachusetts Institute of Technology
+(c) Columbia University
+(d) The National Aeronautics & Space Administration
+(e) Los Alamos National Laboratory

README.md

@@ -64,7 +64,14 @@ Run `python3 example.py --IDnumber=N` to call the `N-th` example. `*.vtk` output
 
 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.) 
 
-`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.
+`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.
+
+`THE CONTRIBUTORS` include:
+(a) The University of Sydney
+(b) The Massachusetts Institute of Technology
+(c) Columbia University
+(d) The National Aeronautics & Space Administration
+(e) Los Alamos National Laboratory
 
 ### `References`
 

example.py

@@ -53,6 +53,9 @@ def example(IDnumber=0):
     elif (IDnumber == +8):
         case_8_(src_path, dst_path)
 
+    elif (IDnumber == -1):
+        for i in range(9): example(i)
+
     return
 
 
@@ -61,7 +64,7 @@ def example(IDnumber=0):
         description=__doc__, formatter_class=argparse.RawTextHelpFormatter)
 
     parser.add_argument("--IDnumber", dest="IDnumber", type=int,
-                        required=True, help="Run example with ID = (0-9).")
+                        required=True, help="Run example with ID = (0-8).")
 
     args = parser.parse_args()
 

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

@@ -0,0 +1,114 @@
+name: CMake Build Matrix
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+
+env:
+  BUILD_TYPE: Debug
+
+jobs:
+  build:
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+        - {
+            name: "Windows Latest MSVC", artifact: "Windows-MSVC.tar.xz",
+            os: windows-latest,
+            cc: "cl", cxx: "cl"
+          }
+        - {
+            name: "Ubuntu Latest GCC", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            cc: "gcc", cxx: "g++"
+          }
+        - {
+            name: "macOS Latest Clang", artifact: "macOS.tar.xz",
+            os: macos-latest,
+            cc: "clang", cxx: "clang++"
+          }
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Print environment
+        run: |
+          echo github.event.action: ${{ github.event.action }}
+          echo github.event_name: ${{ github.event_name }}
+          
+      - name: Install dependencies on win
+        if: startsWith(matrix.config.os, 'windows')
+        run: |
+          choco install ninja cmake
+          ninja --version
+          cmake --version
+          
+      - name: Install dependencies on unx
+        if: startsWith(matrix.config.name, 'ubuntu')
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build cmake
+          ninja --version
+          cmake --version
+          g++ --version
+          
+      - name: Install dependencies on osx
+        if: startsWith(matrix.config.os, 'macos')
+        run: |
+          brew install ninja cmake llvm libomp
+          ninja --version
+          cmake --version
+          clang++ --version
+    
+      - name: Configure jigsaw
+        run: |
+          mkdir ${{github.workspace}}/build
+          cd ${{github.workspace}}/build
+          cmake .. -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+      - name: Build jigsaw
+        run: |
+          cd ${{github.workspace}}/build
+          cmake --build . --config ${{env.BUILD_TYPE}} --target install
+        
+      - name: Clean jigsaw
+        run: rm -r ${{github.workspace}}/build
+
+      - name: Configure tests for jigsaw
+        run: |
+          mkdir ${{github.workspace}}/uni/build
+          cd ${{github.workspace}}/uni/build
+          cmake .. -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+      - name: Build tests for jigsaw
+        run: |
+          cd ${{github.workspace}}/uni/build
+          cmake --build . --config ${{env.BUILD_TYPE}} --target install
+        
+      - name: Prep. tests for jigsaw
+        if: startsWith(matrix.config.os, 'windows')
+        run: |
+          cd ${{github.workspace}}/uni
+          cp ../lib/jigsaw.dll .
+
+      - name: Eval. tests for jigsaw
+        run: |
+          cd ${{github.workspace}}/uni
+          ./test_all
+          
+      - name: Extra tests for jigsaw
+        run: |
+          cd ${{github.workspace}}
+          ./bin/jigsaw example.jig
+          ./bin/jigsaw geo/airfoil.jig
+          ./bin/jigsaw geo/bunny.jig
+          ./bin/jigsaw geo/parts.jig
+          ./bin/jigsaw geo/earth.jig
+          ./bin/jigsaw geo/lakes.jig
+
+      - name: Clean tests for jigsaw
+        run: rm -r ${{github.workspace}}/uni/build

external/jigsaw/LICENSE.md

@@ -2,4 +2,11 @@
 
 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.)
 
-`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.
+`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.
+
+`THE CONTRIBUTORS` include:
+(a) The University of Sydney
+(b) The Massachusetts Institute of Technology
+(c) Columbia University
+(d) The National Aeronautics & Space Administration
+(e) Los Alamos National Laboratory