Merge in of significant developments in metric branch

- Include metric python functions - Diverse new metric test cases - New Caribbean test cases - Test cases tagged, for selective testing - Introduces Tag class and code to read and modify brml tags - Previous shapefile tests added back to test suite - Expand out shapefile and boundary processing Squashed commit of the following: commit 51f271c Author: Adam Candy <[email protected]> Date: Thu Jul 5 15:50:42 2018 +0200 macOs config into travis matrix commit 372580b Merge: ab02f28 ceb0b4e Author: Adam Candy <[email protected]> Date: Thu Jul 5 14:30:30 2018 +0200 Merge branch 'metric' into macOs commit ab02f28 Author: Adam Candy <[email protected]> Date: Thu Jul 5 14:02:06 2018 +0200 Test Diff fix Pydap==3.2.1 commit ceb0b4e Author: Adam Candy <[email protected]> Date: Thu Jul 5 14:02:01 2018 +0200 Test Diff fix Pydap==3.2.1 commit 691c1b9 Author: Adam Candy <[email protected]> Date: Thu Jul 5 13:55:53 2018 +0200 Test Diff fix commit 1d712ae Author: Adam Candy <[email protected]> Date: Thu Jul 5 12:34:43 2018 +0200 Test Diff fix commit ad11930 Author: Adam Candy <[email protected]> Date: Thu Jul 5 12:34:24 2018 +0200 Build fix commit 36641b4 Author: Adam Candy <[email protected]> Date: Thu Jul 5 12:15:52 2018 +0200 Test Diff fix commit d19b17a Author: Adam Candy <[email protected]> Date: Thu Jul 5 11:49:41 2018 +0200 Test Diff fix commit 45ab480 Author: Adam Candy <[email protected]> Date: Thu Jul 5 11:47:56 2018 +0200 Fix for build commit b82d8a4 Author: Adam Candy <[email protected]> Date: Thu Jul 5 11:34:34 2018 +0200 Fix for build commit a334a8b Author: Adam Candy <[email protected]> Date: Thu Jul 5 11:30:35 2018 +0200 Diff testing improve to check points under a tolerance commit 6c36de6 Author: Adam Candy <[email protected]> Date: Wed Jul 4 16:55:43 2018 +0200 Build fix commit 3ecd2e8 Author: Adam Candy <[email protected]> Date: Wed Jul 4 16:54:00 2018 +0200 Diff comparing points -- mid progress commit 981784e Author: Adam Candy <[email protected]> Date: Wed Jul 4 16:00:47 2018 +0200 Build fix commit 9b96a3f Author: Adam Candy <[email protected]> Date: Wed Jul 4 15:32:05 2018 +0200 Build fix commit 86e94e9 Author: Adam Candy <[email protected]> Date: Wed Jul 4 15:23:01 2018 +0200 Build fix commit 6c5740e Author: Adam Candy <[email protected]> Date: Wed Jul 4 15:07:13 2018 +0200 Build fix commit 195149e Author: Adam Candy <[email protected]> Date: Wed Jul 4 15:03:08 2018 +0200 Set Pydap version commit 4bf0fb6 Author: Adam Candy <[email protected]> Date: Wed Jul 4 15:01:13 2018 +0200 Print Pydap version commit 0d262da Author: Adam Candy <[email protected]> Date: Wed Jul 4 14:56:37 2018 +0200 Build fix commit 29276cd Author: Adam Candy <[email protected]> Date: Wed Jul 4 14:38:57 2018 +0200 Build fix commit 9c83aa6 Author: Adam Candy <[email protected]> Date: Wed Jul 4 14:20:14 2018 +0200 Build fix commit 6ede296 Author: Adam Candy <[email protected]> Date: Wed Jul 4 14:08:09 2018 +0200 Retry utm case, scale back debugging info commit 1cec44d Author: Adam Candy <[email protected]> Date: Wed Jul 4 14:04:07 2018 +0200 Build fix commit 04eee71 Author: Adam Candy <[email protected]> Date: Wed Jul 4 00:08:18 2018 +0200 Use wait fix for build commit e45adac Author: Adam Candy <[email protected]> Date: Wed Jul 4 00:04:40 2018 +0200 New Travis config commit abc2ef4 Author: Adam Candy <[email protected]> Date: Tue Jul 3 23:43:38 2018 +0200 Temporarily disable utm test, failing with gz download issue (only on Ubuntu, not macOs) commit 069ff7d Author: Adam Candy <[email protected]> Date: Tue Jul 3 23:40:46 2018 +0200 Set python version commit 8d6f00e Author: Adam Candy <[email protected]> Date: Tue Jul 3 23:34:32 2018 +0200 Fix travis config commit 22d0fc8 Author: Adam Candy <[email protected]> Date: Tue Jul 3 23:14:16 2018 +0200 Remove intentional error line commit cc7b398 Author: Adam Candy <[email protected]> Date: Tue Jul 3 23:10:38 2018 +0200 Trigger build commit afa2cb0 Author: Adam Candy <[email protected]> Date: Tue Jul 3 23:04:13 2018 +0200 Try Trusty pip build commit cd7f356 Author: Adam Candy <[email protected]> Date: Tue Jul 3 22:58:42 2018 +0200 Rerun2 commit 2a517f7 Author: Adam Candy <[email protected]> Date: Tue Jul 3 22:56:37 2018 +0200 Rerun macOs build commit e19a572 Author: Adam Candy <[email protected]> Date: Tue Jul 3 22:55:41 2018 +0200 Update .travis.yml commit 0d9d612 Author: Adam Candy <[email protected]> Date: Tue Jul 3 22:52:54 2018 +0200 Test commit 6de8da0 Author: Adam Candy <[email protected]> Date: Tue Jul 3 22:47:32 2018 +0200 xenial build commit f5185cc Author: Adam Candy <[email protected]> Date: Tue Jul 3 22:41:04 2018 +0200 Build fix commit 6706937 Author: Adam Candy <[email protected]> Date: Tue Jul 3 22:35:05 2018 +0200 pip install and shapely fixes commit 496fc35 Author: Adam Candy <[email protected]> Date: Tue Jul 3 22:26:42 2018 +0200 Remove python 2.7 requirement commit 11bf30f Author: Adam Candy <[email protected]> Date: Tue Jul 3 22:21:29 2018 +0200 New macOs test commit 7e1c5e1 Author: Adam Candy <[email protected]> Date: Tue Jul 3 21:58:41 2018 +0200 Update .travis.yml Draft build spec for macOs commit 2552e18 Author: Adam Candy <[email protected]> Date: Tue Jul 3 21:51:10 2018 +0200 Switch to metric branch commit 98e271b Author: Adam Candy <[email protected]> Date: Tue Jul 3 21:48:04 2018 +0200 Test error commit 1921926 Author: Adam Candy <[email protected]> Date: Tue Jul 3 21:18:11 2018 +0200 New Xenial and precise build commit 81157fa Author: Adam Candy <[email protected]> Date: Tue Jul 3 21:12:59 2018 +0200 Xenial streamline commit cf1e339 Author: Adam Candy <[email protected]> Date: Tue Jul 3 21:02:08 2018 +0200 Xenial fix commit c71029a Author: Adam Candy <[email protected]> Date: Tue Jul 3 20:52:28 2018 +0200 Xenial fix commit e19a6a2 Author: Adam Candy <[email protected]> Date: Tue Jul 3 20:49:18 2018 +0200 New check for failures commit 3ccaeef Author: Adam Candy <[email protected]> Date: Tue Jul 3 18:19:55 2018 +0200 Travis config fix commit 269cd4b Author: Adam Candy <[email protected]> Date: Tue Jul 3 18:15:11 2018 +0200 All pass locally - ajustment for test Earth_Global_filtered_200km_30min_metric commit acfa477 Author: Adam Candy <[email protected]> Date: Tue Jul 3 18:03:27 2018 +0200 Add debugging print for test UK_NorthSea_gebco2014_opendap commit f10e04c Author: Adam Candy <[email protected]> Date: Tue Jul 3 17:46:55 2018 +0200 Build fixes commit 3e977c0 Author: Adam Candy <[email protected]> Date: Tue Jul 3 17:36:15 2018 +0200 Docker adjust for travis test build commit 8add130 Author: Adam Candy <[email protected]> Date: Tue Jul 3 17:03:51 2018 +0200 Travis fix commit 947a2f5 Author: Adam Candy <[email protected]> Date: Thu Jun 8 18:45:12 2017 +0200 Insulate from filename differences commit ab0b944 Author: Adam Candy <[email protected]> Date: Thu Jun 8 18:08:22 2017 +0200 Updated tests, all passing commit bef3717 Author: Adam Candy <[email protected]> Date: Thu Jun 8 18:04:49 2017 +0200 Updated tests and two new ones for projection handling update commit d5fdf35 Author: Adam Candy <[email protected]> Date: Thu Jun 8 17:02:19 2017 +0200 Cartesian edited commit c3f52d5 Author: Adam Candy <[email protected]> Date: Thu Jun 8 17:00:57 2017 +0200 LongLat added commit aed9ca3 Author: Adam Candy <[email protected]> Date: Thu Jun 8 16:59:42 2017 +0200 Before projection renaming commit d7ef667 Author: Adam Candy <[email protected]> Date: Thu Jun 8 16:08:41 2017 +0200 Fixes for projections commit f269726 Author: Adam Candy <[email protected]> Date: Thu Jun 8 14:19:22 2017 +0200 Gradual fixing for a dx in metres: UK_NorthSea_region_opendap commit a81f9c1 Author: Adam Candy <[email protected]> Date: Thu Jun 8 01:14:34 2017 +0200 mid fix commit 0503ad1 Author: Adam Candy <[email protected]> Date: Thu Jun 8 00:47:40 2017 +0200 fix commit 66423b5 Author: Adam Candy <[email protected]> Date: Thu Jun 8 00:36:53 2017 +0200 fixes commit a09a950 Author: Adam Candy <[email protected]> Date: Thu Jun 8 00:10:38 2017 +0200 Change method of reversal commit 7d1a873 Author: Adam Candy <[email protected]> Date: Thu Jun 8 00:00:46 2017 +0200 orthodrome code tidied up commit ea177cf Author: Adam Candy <[email protected]> Date: Wed Jun 7 15:47:51 2017 +0200 Mid-development on area calc improvements commit 9ec241d Author: Adam Candy <[email protected]> Date: Sat Jun 3 02:56:40 2017 +0200 Optimisation to restore speed commit c808cf9 Author: Adam Candy <[email protected]> Date: Sat Jun 3 02:08:31 2017 +0200 Projection optimisations commit 3d717c6 Author: Adam Candy <[email protected]> Date: Sat Jun 3 01:54:57 2017 +0200 Projection fixes commit 480d7ed Author: Adam Candy <[email protected]> Date: Fri Jun 2 18:50:19 2017 +0200 Tidying projection handling commit f597335 Author: Adam Candy <[email protected]> Date: Fri Jun 2 15:05:47 2017 +0200 Clean up output, vertices property implementation commit c730213 Author: Adam Candy <[email protected]> Date: Fri Jun 2 14:38:28 2017 +0200 Valid case for Portland commit 91e21bc Author: Adam Candy <[email protected]> Date: Fri Jun 2 14:05:12 2017 +0200 Shape input fixed, key tests all passing commit 50a3b97 Author: Adam Candy <[email protected]> Date: Thu Jun 1 22:26:24 2017 +0200 Test valid update commit 2052c83 Author: Adam Candy <[email protected]> Date: Thu Jun 1 21:53:09 2017 +0200 String op fix commit fa34051 Author: Adam Candy <[email protected]> Date: Thu Jun 1 21:23:47 2017 +0200 Fix image handler, space-sep output commit 880dda2 Author: Adam Candy <[email protected]> Date: Thu Jun 1 15:48:53 2017 +0200 Test fixes, shapely further integration commit fe18fcb Author: Adam Candy <[email protected]> Date: Thu Jun 1 13:03:30 2017 +0200 Improved metric file handling commit 5c151e2 Author: Adam Candy <[email protected]> Date: Wed May 31 22:43:46 2017 +0200 BBox work commit aa07f45 Author: Adam Candy <[email protected]> Date: Wed May 31 16:42:40 2017 +0200 Add cmd to use commit 74066c2 Author: Adam Candy <[email protected]> Date: Wed May 31 16:41:00 2017 +0200 Test case fixing for new upgrade, line interpolation commit 68cada6 Author: Adam Candy <[email protected]> Date: Wed May 31 14:04:14 2017 +0200 Further shapely integration, Filchner-Ronne working commit 260e287 Author: Adam Candy <[email protected]> Date: Wed May 31 01:28:25 2017 +0200 Connecting component breps nearly done commit 36c6e4c Author: Adam Candy <[email protected]> Date: Tue May 30 18:30:07 2017 +0200 Little note commit de52de0 Author: Adam Candy <[email protected]> Date: Tue May 30 18:11:56 2017 +0200 Command to use while testing commit e787299 Author: Adam Candy <[email protected]> Date: Tue May 30 18:11:02 2017 +0200 Improved shapely integration commit 827d5ca Author: Adam Candy <[email protected]> Date: Mon May 29 17:42:14 2017 +0200 Path treatment improvements commit db43454 Author: Adam Candy <[email protected]> Date: Fri May 19 18:33:15 2017 +0200 Needs some thought on best way to streamline commit c5dcde9 Merge: 75d03a1 9576002 Author: Adam Candy <[email protected]> Date: Wed May 17 12:00:40 2017 +0200 Merge branch 'master' into metric - fix test commit 75d03a1 Author: Adam Candy <[email protected]> Date: Wed May 17 10:45:11 2017 +0200 Include missed test commit d5f81fd Author: Adam Candy <[email protected]> Date: Wed May 17 10:39:02 2017 +0200 Clean up test commit b006ff7 Author: Adam Candy <[email protected]> Date: Tue May 16 21:09:54 2017 +0200 Clean up output commit 8cb2a32 Author: Adam Candy <[email protected]> Date: Tue May 16 19:39:22 2017 +0200 Integrate previous shapefile tests into suite commit eb61999 Author: Adam Candy <[email protected]> Date: Mon May 15 17:41:20 2017 +0200 Updated tests commit ae027bd Author: Adam Candy <[email protected]> Date: Mon May 15 17:11:04 2017 +0200 Restore linefeeds in test descriptions commit b699097 Author: Adam Candy <[email protected]> Date: Mon May 15 16:54:34 2017 +0200 Consider test tags, make test now operates on those tagged 'continuous' commit 19fc16e Author: Adam Candy <[email protected]> Date: Mon May 15 16:54:22 2017 +0200 Update test descriptions to include tags commit e93790b Author: Adam Candy <[email protected]> Date: Mon May 15 15:34:03 2017 +0200 Update Tag class, schema tags commit a7f72a4 Author: Adam Candy <[email protected]> Date: Mon May 15 15:31:05 2017 +0200 Python code for modifying test tags, introduces Tag class commit 2b27a87 Author: Adam Candy <[email protected]> Date: Mon May 15 14:23:22 2017 +0200 Add Caribbean metric case commit c652640 Author: Adam Candy <[email protected]> Date: Fri Apr 21 15:56:18 2017 +0200 Clean up and case update commit 0cb09dc Author: Adam Candy <[email protected]> Date: Fri Apr 21 15:52:52 2017 +0200 Metric python function available in BRML commit ebe88f5 Author: Adam Candy <[email protected]> Date: Fri Apr 21 10:14:35 2017 +0200 Reduce verbosity in testing commit a820a03 Author: Adam Candy <[email protected]> Date: Fri Apr 21 09:51:53 2017 +0200 Merge in from master of release v2.0.2. Merge of simplify_build feature branch, which enables setuptools to build all dependencies, relaxes enforcement of flat namespace library, move local Docker container testing online, and exposes diverse range of tests now online, package name fixes, eliminates initial data downloads, Scientific fixes for Trusty available on Travis and various other Travis fixes. commit 6419657 Author: Adam Candy <[email protected]> Date: Tue Apr 11 17:57:09 2017 +0200 Improved UK metric test case, metric based on gravity wave speed commit 097f872 Author: Adam Candy <[email protected]> Date: Tue Apr 11 17:42:15 2017 +0200 Update test case for metric commit 92eab2b Author: Adam Candy <[email protected]> Date: Tue Apr 11 17:40:19 2017 +0200 Metric code working again, more generally commit 2354081 Author: Adam Candy <[email protected]> Date: Tue Apr 11 14:03:26 2017 +0200 Optimised dataset handling commit f6b9975 Author: Adam Candy <[email protected]> Date: Tue Apr 11 10:08:19 2017 +0200 Initial improvements to importing code
shingleproject · Jul 5, 2018 · 908dab9 · 908dab9
1 parent 9576002
commit 908dab9
Show file tree

Hide file tree

Showing 80 changed files with 327,304 additions and 308,073 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile_precise b/Dockerfile_precise
@@ -27,6 +27,7 @@ RUN apt-get update && apt-get install -y \
         curl
 
 RUN pip install Pydap
+RUN pip install Shapely
 
 # Set build compiler environment 
 ENV CC=gcc
@@ -43,7 +44,7 @@ WORKDIR /home/shingle
 RUN git clone https://github.com/adamcandy/Shingle.git
 WORKDIR /home/shingle/Shingle
 
-RUN git checkout simplify_build
+RUN git checkout metric
 
 #ARG SHINGLE_URL=unknown
 RUN git pull
@@ -55,7 +56,7 @@ ENV PATH /home/shingle/Shingle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr
 #RUN pip install numpy matplotlib pyproj Pydap shapely Pillow
 
 # Pre-download, to best work with Travis timeout
-RUN curl http://store.pangaea.de/Publications/TimmermannR_et_al_2010/RTopo105b_50S.nc -o test/Amundsen_Sea/data/RTopo.nc
+#RUN curl http://store.pangaea.de/Publications/TimmermannR_et_al_2010/RTopo105b_50S.nc -o test/Amundsen_Sea/data/RTopo.nc
 
 RUN make
 #RUN make unittest

diff --git a/Dockerfile_xenial b/Dockerfile_xenial
@@ -24,9 +24,18 @@ RUN apt-get update && apt-get install -y \
         python-imaging \
         gmsh \
         python-py \
+        python-dap \
         curl
 
-RUN pip install Pydap
+#RUN echo "nameserver 8.8.8.8" >> /etc/resolv.conf && \ 
+#    echo "nameserver 8.8.4.4" >> /etc/resolv.conf && \    
+#    pip install Pydap
+
+# RUN pip install Pydap
+
+
+RUN pip install -i https://pypi.python.org/simple/ --upgrade pip
+
 
 # Set build compiler environment 
 ENV CC=gcc
@@ -43,7 +52,7 @@ WORKDIR /home/shingle
 RUN git clone https://github.com/adamcandy/Shingle.git
 WORKDIR /home/shingle/Shingle
 
-RUN git checkout simplify_build
+RUN git checkout metric
 
 #ARG SHINGLE_URL=unknown
 RUN git pull
@@ -55,7 +64,7 @@ ENV PATH /home/shingle/Shingle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr
 #RUN pip install numpy matplotlib pyproj Pydap shapely Pillow
 
 # Pre-download, to best work with Travis timeout
-RUN curl http://store.pangaea.de/Publications/TimmermannR_et_al_2010/RTopo105b_50S.nc -o test/Amundsen_Sea/data/RTopo.nc
+#RUN curl http://store.pangaea.de/Publications/TimmermannR_et_al_2010/RTopo105b_50S.nc -o test/Amundsen_Sea/data/RTopo.nc
 
 RUN make
 #RUN make unittest

diff --git a/cmd b/cmd
@@ -0,0 +1,7 @@
+./bin/shingle test/Filchner-Ronne/Filchner-Ronne.brml; vim -d /Users/acandy/src/Shingle/test/Filchner-Ronne/data/Filchner-Ronne_valid2.geo /Users/acandy/src/Shingle/test/Filchner-Ronne/Filchner-Ronne.geo
+
+./bin/shingle test/Filchner-Ronne/Filchner-Ronne.brml; icdiff -U 0 ~/src/Shingle/test/Filchner-Ronne/data/Filchner-Ronne_valid2.geo ~/src/Shingle/test/Filchner-Ronne/Filchner-Ronne.geo
+
+
+shingle UK_NorthSea_region_opendap.brml
+
diff --git a/schema/shingle_options.rnc b/schema/shingle_options.rnc
@@ -122,6 +122,62 @@ reference_options =
     }
   )
 
+projections =
+  (
+    ## Projection of input data source:
+    ## Automatic, read from source
+    ## (as much as possible)
+    element projection {
+      attribute name { "Automatic" },
+      comment
+    }|
+    ## Projection of input data source:
+    ## Cartesian
+    element projection {
+      attribute name { "Cartesian" },
+      comment
+    }|
+    ## Projection of input data source:
+    ## Longitude - Latitude
+    element projection {
+      attribute name { "LongLat" },
+      comment
+    }|
+    ## Projection of input data source:
+    ## Stereographic
+    ##
+    ## Needs pole orientation?
+    element projection {
+      attribute name { "Stereographic" },
+      comment
+    }|
+    ## Projection of input data source:
+    ## Proj4 string
+    element projection {
+      attribute name { "Proj4_string" },
+      string,
+      comment
+    }|
+    ## Projection of input data source:
+    ## Legacy: proj_cartesian
+    element projection {
+      attribute name { "proj_cartesian" },
+      comment
+    }|
+    ## Projection of input data source:
+    ## Legacy: proj_cartesian_inverse
+    element projection {
+      attribute name { "proj_cartesian_inverse" },
+      comment
+    }|
+    ## Projection of input data source:
+    ## Legacy: Hammer
+    element projection {
+      attribute name { "Hammer" },
+      comment
+    }
+  )
+
 datasets =
   (
     ## Boundary representation component
@@ -132,36 +188,7 @@ datasets =
       |dataset_polyline
       |dataset_gis_project
       ),
-      (
-        ## Projection of input data source:
-        ## Automatic, read from source
-        ## (as much as possible)
-        element projection {
-          attribute name { "Automatic" },
-          comment
-        }|
-        ## Projection of input data source:
-        ## Cartesian
-        element projection {
-          attribute name { "Cartesian" },
-          comment
-        }|
-        ## Projection of input data source:
-        ## Stereographic
-        ##
-        ## Needs pole orientation?
-        element projection {
-          attribute name { "Stereographic" },
-          comment
-        }|
-        ## Projection of input data source:
-        ## Proj4 string
-        element projection {
-          attribute name { "Proj4_string" },
-          string,
-          comment
-        }
-      )
+      projections
     }
   )
 
@@ -244,7 +271,7 @@ dataset_polyline_options =
       attribute name { "Local_file" },
       attribute file_name { string },
       comment
-    },
+    }|
     ## Source shapefile (.shp) containing polyline information
     ##
     ## See: http://www.opendap.org
@@ -320,17 +347,7 @@ output =
         comment
       }?,
       comment,
-      ## Output Projection type
-      ##
-      ## Default: cartesian
-      ##
-      ## Legacy: projection
-      element projection {
-        element string_value {
-          "cartesian" | "proj_cartesian" | "proj_cartesian_inverse" | "hammer" | "longlat"
-        },
-        comment
-      }?,
+      projections?,
       (
         ## User defined viewing angle
         element orientation {
@@ -481,7 +498,16 @@ geoid_surface_representation_brep =
         ##
         ## Legacy: compound
         element representation_type {
-          attribute name { "BSplines" },
+          attribute name { "Polyline" },
+          comment
+        }|
+        ## Representation type for the component brep
+        ##
+        ## Default: BSplines
+        ##
+        ## Legacy: compound
+        element representation_type {
+          attribute name { "BSpline" },
           comment
         }|
 
@@ -1311,6 +1337,12 @@ tags =
         attribute name { 'RTopo' },
         comment
       }|
+      ## Cases containing boundary representations that are
+      ## (at least partly) defined by shapefile descriptions.
+      element tag {
+        attribute name { 'Shapefile' },
+        comment
+      }|
       ## Tests executed in the open, online continuous verification suite
       element tag {
         attribute name { 'continuous' },