Merge pull request #48 from dengwirda/dev

Update to jigsaw-0.9.15.x II
dengwirda · Jun 7, 2022 · 5c46d96 · 5c46d96
2 parents c1ae474 + 1978603
commit 5c46d96
Show file tree

Hide file tree

Showing 145 changed files with 33,453 additions and 5,816 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,79 +7,166 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - gcc-8
-            - g++-8
+            - gcc-9
+            - g++-9
       script:
-        - export CC=gcc-8
-        - export CXX=g++-8
+        - export CC=gcc-9
+        - export CXX=g++-9
         - mkdir build
         - cd build
-        - cmake .. -DCMAKE_BUILD_TYPE=Release
-        - cmake --build . --config Release --target install
+        - cmake .. -DCMAKE_BUILD_TYPE=Debug
+        - cmake --build . --config Debug --target install
         - cd ..
-        - ./bin/jigsaw example.jig
+        - rm -r build
         - cd uni
         - mkdir build
         - cd build
         - cmake .. -DCMAKE_BUILD_TYPE=Debug
         - cmake --build . --config Debug --target install
         - cd ..
-        - ./test_1
-        - ./test_2
-        - ./test_3
-        - ./test_4
-        - ./test_5
-        - ./test_6
-        - ./test_7
-        - ./test_8
-        - ./test_9
-
-    - os: osx
-      osx_image: xcode11
-      script:
+        - rm -r build
+        - ./test2d_a
+        - ./test3d_a
+        - ./test2s_a
+        - ./test2d_b
+        - ./test3d_b
+        - ./test2s_b
+        - ./test2d_c
+        - ./test3d_c
+        - ./test2s_c
+        - ./test2d_d
+        - ./test3d_d
+        - ./test2d_e
+        - ./test3d_e
+        - ./test2s_e
+        - ./test2d_f
+        - ./test3d_f
+        - ./test2s_f
+        - ./test2d_g
+        - ./test3d_g
+        - ./test2s_g
+        - ./test2d_h
+        - ./test2s_h
+        - ./test2d_i
+        - ./test2s_i
+        - cd ..
         - mkdir build
         - cd build
         - cmake .. -DCMAKE_BUILD_TYPE=Release
         - cmake --build . --config Release --target install
         - cd ..
+        - rm -r build
         - ./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
+
+    - os: osx
+      osx_image: xcode12
+      script:
+        - mkdir build
+        - cd build
+        - cmake .. -DCMAKE_BUILD_TYPE=Debug
+        - cmake --build . --config Debug --target install
+        - cd ..
+        - rm -r build
         - cd uni
         - mkdir build
         - cd build
         - cmake .. -DCMAKE_BUILD_TYPE=Debug
         - cmake --build . --config Debug --target install
         - cd ..
-        - ./test_1
-        - ./test_2
-        - ./test_3
-        - ./test_4
-        - ./test_5
-        - ./test_6
-        - ./test_7
-        - ./test_8
-        - ./test_9
+        - rm -r build
+        - ./test2d_a
+        - ./test3d_a
+        - ./test2s_a
+        - ./test2d_b
+        - ./test3d_b
+        - ./test2s_b
+        - ./test2d_c
+        - ./test3d_c
+        - ./test2s_c
+        - ./test2d_d
+        - ./test3d_d
+        - ./test2d_e
+        - ./test3d_e
+        - ./test2s_e
+        - ./test2d_f
+        - ./test3d_f
+        - ./test2s_f
+        - ./test2d_g
+        - ./test3d_g
+        - ./test2s_g
+        - ./test2d_h
+        - ./test2s_h
+        - ./test2d_i
+        - ./test2s_i
+        - cd ..
+        - mkdir build
+        - cd build
+        - cmake .. -DCMAKE_BUILD_TYPE=Release
+        - cmake --build . --config Release --target install
+        - cd ..
+        - rm -r build
+        - ./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
 
     - os: windows
       script:
         - mkdir build
         - cd build
-        - cmake .. -DCMAKE_BUILD_TYPE=Release
-        - cmake --build . --config Release --target install
+        - cmake .. -DCMAKE_BUILD_TYPE=Debug
+        - cmake --build . --config Debug --target install
         - cd ..
-        - ./bin/jigsaw.exe example.jig
+        - rm -r build
         - cp lib/jigsaw.dll uni
         - cd uni
         - mkdir build
         - cd build
         - cmake .. -DCMAKE_BUILD_TYPE=Debug
         - cmake --build . --config Debug --target install
         - cd ..
-        - ./test_1.exe
-        - ./test_2.exe
-        - ./test_3.exe
-        - ./test_4.exe
-        - ./test_5.exe
-        - ./test_6.exe
-        - ./test_7.exe
-        - ./test_8.exe
-        - ./test_9.exe
+        - rm -r build
+        - ./test2d_a
+        - ./test3d_a
+        - ./test2s_a
+        - ./test2d_b
+        - ./test3d_b
+        - ./test2s_b
+        - ./test2d_c
+        - ./test3d_c
+        - ./test2s_c
+        - ./test2d_d
+        - ./test3d_d
+        - ./test2d_e
+        - ./test3d_e
+        - ./test2s_e
+        - ./test2d_f
+        - ./test3d_f
+        - ./test2s_f
+        - ./test2d_g
+        - ./test3d_g
+        - ./test2s_g
+        - ./test2d_h
+        - ./test2s_h
+        - ./test2d_i
+        - ./test2s_i
+        - cd ..
+        - mkdir build
+        - cd build
+        - cmake .. -DCMAKE_BUILD_TYPE=Release
+        - cmake --build . --config Release --target install
+        - cd ..
+        - rm -r build
+        - ./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
diff --git a/README.md b/README.md
@@ -50,7 +50,9 @@ The full `JIGSAW` src can be found in <a href="../master/src/">`../jigsaw/src/`<
     * cmake --build . --config BUILD_MODE --target install
     * Delete the temporary BUILD directory.
 
-This process will build a series of executables and shared libraries: `jigsaw` itself - the main command-line meshing utility, `tripod` - `JIGSAW`'s tessellation infrastructure, `marche` - a fast-marching solver designed to optimise mesh-spacing configurations, as well as `libjigsaw` - `JIGSAW`'s shared `API`. `BUILD_MODE` can be used to select different compiler configurations and should generally either be `Release` or `Debug`. 
+This process will build a series of executables and shared libraries: `jigsaw` itself - the main command-line meshing utility, `tripod` - `JIGSAW`'s tessellation infrastructure, `marche` - a fast-marching solver designed to optimise mesh-spacing configurations, as well as `libjigsaw` - `JIGSAW`'s shared `API`. 
+
+`BUILD_MODE` can be used to select different compiler configurations and should generally either be `Release` or `Debug`. 
 
 See `example.jig` for documentation on calling the command-line executables, and the headers in <a href="../master/inc/">`../jigsaw/inc/`</a> for details on the `API`.
 

diff --git a/example.jig b/example.jig
@@ -309,9 +309,22 @@
 #   OPTM_KERN = CVT+DQDX
 
 
+#   ---> OPTM_COST - {default='area-len'} mesh optimisation
+        cost metric, choice of area-length (COST='area-len') 
+        or skewed-cosine (COST='skew-cos') functions.
+        The area-length metric is symmetric wrt. both small 
+        and large cell angles, and is typically appropriate
+        for simplex-only meshes. The skewed-cosine metric is 
+        based on an asymmetric penalisation of large cell
+        angles, and may be useful for staggered primal-dual 
+        tessellations.
+
+#   OPTM_COST = SKEW-COS
+
+
 #   ---> OPTM_ITER - {default=16} max. number of mesh optim-
 #       isation iterations. Set ITER=N to see progress after 
-#       N iterations. 
+#       N iterations.
 #
 
 #   OPTM_ITER = 32

diff --git a/geo/airfoil.jig b/geo/airfoil.jig
@@ -0,0 +1,26 @@
+
+#
+#   AIRFOIL.JIG: simple airfoil 
+#
+
+#   To run on WIN platforms:
+#
+#       bin\jigsaw.exe geo\airfoil.jig
+#
+#   To run on LNX platforms:
+#
+#       bin/jigsaw     geo/airfoil.jig
+#
+#   from jigsaw root folder.
+#
+
+    GEOM_FILE = geo/airfoil.msh
+    MESH_FILE = out/airfoil.msh
+    VERBOSITY = 1
+    GEOM_FEAT = TRUE
+    MESH_TOP1 = TRUE
+    MESH_DIMS = 2
+    HFUN_HMAX = 0.01
+
+
+
diff --git a/geo/bunny.jig b/geo/bunny.jig
@@ -0,0 +1,24 @@
+
+#
+#   BUNNY.JIG: stanford bunny 
+#
+
+#   To run on WIN platforms:
+#
+#       bin\jigsaw.exe geo\bunny.jig
+#
+#   To run on LNX platforms:
+#
+#       bin/jigsaw     geo/bunny.jig
+#
+#   from jigsaw root folder.
+#
+
+    GEOM_FILE = geo/bunny.msh
+    MESH_FILE = out/bunny.msh
+    VERBOSITY = 1
+    MESH_DIMS = 2
+    HFUN_HMAX = 0.0125
+
+
+
diff --git a/geo/earth.jig b/geo/earth.jig
@@ -0,0 +1,25 @@
+
+#
+#   EARTH.JIG: mesh coastlines 
+#
+
+#   To run on WIN platforms:
+#
+#       bin\jigsaw.exe geo\earth.jig
+#
+#   To run on LNX platforms:
+#
+#       bin/jigsaw     geo/earth.jig
+#
+#   from jigsaw root folder.
+#
+
+    GEOM_FILE = geo/earth.msh
+    MESH_FILE = out/earth.msh
+    VERBOSITY = 1
+    MESH_DIMS = 1
+    GEOM_SEED = 256
+    HFUN_HMAX = 0.005
+
+
+