From: David Wells <wellsd2@rpi.edu>
Date: Thu, 12 Jan 2017 15:08:20 +0000 (-0500)
Subject: Fix some dead UNV links.
X-Git-Tag: v8.5.0-rc1~258^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e71de387be18ccf51df146b4a4da0a44f1e00fa;p=dealii.git

Fix some dead UNV links.
---

diff --git a/include/deal.II/grid/grid_in.h b/include/deal.II/grid/grid_in.h
index da171c89bb..45b624efc8 100644
--- a/include/deal.II/grid/grid_in.h
+++ b/include/deal.II/grid/grid_in.h
@@ -156,14 +156,14 @@ template <int dim> struct CellData;
  * that the GridIn::read_unv function supports are documented here:
  * <ul>
  * <li> section 2411:
- * http://www.sdrl.uc.edu/universal-file-formats-for-modal-analysis-testing-1/file-format-storehouse/unv_2411.htm
+ * http://www.sdrl.uc.edu/sdrl/referenceinfo/universalfileformats/file-format-storehouse/universal-dataset-number-2411
  * <li> section 2412:
- * http://www.sdrl.uc.edu/universal-file-formats-for-modal-analysis-testing-1/file-format-storehouse/unv_2412.htm
+ * http://www.sdrl.uc.edu/sdrl/referenceinfo/universalfileformats/file-format-storehouse/universal-dataset-number-2412
  * <li> section 2467:
- * http://www.sdrl.uc.edu/universal-file-formats-for-modal-analysis-testing-1/file-format-storehouse/unv_2467.htm
+ * http://www.sdrl.uc.edu/sdrl/referenceinfo/universalfileformats/file-format-storehouse/universal-dataset-number-2467
  * <li> all sections of this format, even if they may not be supported in our
  * reader, can be found here:
- * http://www.sdrl.uc.edu/universal-file-formats-for-modal-analysis-testing-1/file-format-storehouse/file-formats
+ * http://www.sdrl.uc.edu/sdrl/referenceinfo/universalfileformats/file-format-storehouse
  * </ul>
  * Note that Salome, let's say in 2D, can only make a quad mesh on an object
  * that has exactly 4 edges (or 4 pieces of the boundary). That means, that if
diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc
index 822dd56522..a78b6707c3 100644
--- a/source/grid/grid_in.cc
+++ b/source/grid/grid_in.cc
@@ -397,7 +397,9 @@ void GridIn<dim, spacedim>::read_unv(std::istream &in)
   AssertThrow(in, ExcIO());
   in >> tmp;
 
-  AssertThrow(tmp == 2411, ExcUnknownSectionType(tmp)); // section 2411 describes vertices http://www.sdrl.uc.edu/universal-file-formats-for-modal-analysis-testing-1/file-format-storehouse/unv_2411.htm/
+  // section 2411 describes vertices: see
+  // http://www.sdrl.uc.edu/sdrl/referenceinfo/universalfileformats/file-format-storehouse/universal-dataset-number-2411
+  AssertThrow(tmp == 2411, ExcUnknownSectionType(tmp));
 
   std::vector< Point<spacedim> > vertices; // vector of vertex coordinates
   std::map<int, int> vertex_indices; // # vert in unv (key) ---> # vert in deal.II (value)
@@ -437,7 +439,9 @@ void GridIn<dim, spacedim>::read_unv(std::istream &in)
   AssertThrow(in, ExcIO());
   in >> tmp;
 
-  AssertThrow(tmp == 2412, ExcUnknownSectionType(tmp)); // section 2412 describes elements http://www.sdrl.uc.edu/universal-file-formats-for-modal-analysis-testing-1/file-format-storehouse/unv_2412.htm/
+  // section 2412 describes elements: see
+  // http://www.sdrl.uc.edu/sdrl/referenceinfo/universalfileformats/file-format-storehouse/universal-dataset-number-2412
+  AssertThrow(tmp == 2412, ExcUnknownSectionType(tmp));
 
   std::vector< CellData<dim> > cells; // vector of cells
   SubCellData subcelldata;
@@ -540,8 +544,11 @@ void GridIn<dim, spacedim>::read_unv(std::istream &in)
       AssertThrow(in, ExcIO());
       in >> tmp;
 
-      AssertThrow((tmp == 2467)||(tmp == 2477), ExcUnknownSectionType(tmp)); // section 2467 (2477) describes (materials - first and bcs - second) or (bcs - first and materials - second) - sequence depends on which group is created first
-      // http://www.sdrl.uc.edu/universal-file-formats-for-modal-analysis-testing-1/file-format-storehouse/unv_2467.htm/
+      // section 2467 (2477) describes (materials - first and bcs - second) or
+      // (bcs - first and materials - second) - sequence depends on which
+      // group is created first: see
+      // http://www.sdrl.uc.edu/sdrl/referenceinfo/universalfileformats/file-format-storehouse/universal-dataset-number-2467
+      AssertThrow((tmp == 2467)||(tmp == 2477), ExcUnknownSectionType(tmp));
 
       while (tmp != -1) // we do until reach end of 2467 or 2477
         {