Merge pull request #89 from baagaard-usgs/update-headers

Update headers, version number, update test containers.
geodynamics · Dec 13, 2023 · 250cc97 · 250cc97
2 parents d8e2a6e + bddcbba
commit 250cc97
Show file tree

Hide file tree

Showing 260 changed files with 2,444 additions and 4,228 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,4 @@
-## Version 3.1.0 (TBD)
+## Version 3.1.0 (2023/12/11)
 
 * Add `AnalyticDB` for a spatial database composed of analytic functions.
 * Add `CSGeoLocal` for local rotated geographic coordinate systems.

diff --git a/Makefile.am b/Makefile.am
@@ -1,18 +1,12 @@
-# -*- Makefile -*-
+# =================================================================================================
+# This code is part of SpatialData, developed through the Computational Infrastructure
+# for Geodynamics (https://github.com/geodynamics/spatialdata).
 #
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard, U.S. Geological Survey
-#
-# This code was developed as part of the Computational Infrastructure
-# for Geodynamics (http://geodynamics.org).
-#
-# Copyright (c) 2010-2023 University of California, Davis
-#
-# See LICENSE.md for license information.
-#
-# ----------------------------------------------------------------------
+# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+# All rights reserved.
 #
+# See https://mit-license.org/ and LICENSE.md and for license information. 
+# =================================================================================================
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/applications/gensimpledb.py b/applications/gensimpledb.py
@@ -1,18 +1,14 @@
 #!/usr/bin/env nemesis
 #
-# ======================================================================
+# =================================================================================================
+# This code is part of SpatialData, developed through the Computational Infrastructure
+# for Geodynamics (https://github.com/geodynamics/spatialdata).
 #
-# Brad T. Aagaard, U.S. Geological Survey
-#
-# This code was developed as part of the Computational Infrastructure
-# for Geodynamics (http://geodynamics.org).
-#
-# Copyright (c) 2010-2023 University of California, Davis
-#
-# See LICENSE.md for license information.
-#
-# ======================================================================
+# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+# All rights reserved.
 #
+# See https://mit-license.org/ and LICENSE.md and for license information. 
+# =================================================================================================
 # @file spatialdata/applications/gensimpledb.py
 #
 # @brief Generic use of GenSimpleDBApp.

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -4,7 +4,7 @@ trigger:
   - main
 
 pool:
-  vmImage: "ubuntu-20.04"
+  vmImage: "ubuntu-22.04"
 
 variables:
   IMAGE_REGISTRY: "ghcr.io/geodynamics/pylith_installer"
@@ -48,10 +48,12 @@ stages:
               BASE_IMAGE: "testenv-ubuntu-22.04"
             ubuntu_23.04:
               BASE_IMAGE: "testenv-ubuntu-23.04"
-            fedora_37:
-              BASE_IMAGE: "testenv-fedora-37"
+            ubuntu_23.10:
+              BASE_IMAGE: "testenv-ubuntu-23.10"
             fedora_38:
               BASE_IMAGE: "testenv-fedora-38"
+            fedora_39:
+              BASE_IMAGE: "testenv-fedora-39"
             centos_7:
               BASE_IMAGE: "testenv-centos-7"
             rockylinux_8:

diff --git a/configure.ac b/configure.ac
@@ -1,21 +1,15 @@
-dnl -*- autoconf -*-
+dnl ================================================================================================
+dnl This code is part of SpatialData, developed through the Computational Infrastructure
+dnl for Geodynamics (https://github.com/geodynamics/spatialdata).
 dnl
-dnl ----------------------------------------------------------------------
-dnl
-dnl Brad T. Aagaard, U.S. Geological Survey
-dnl
-dnl This code was developed as part of the Computational Infrastructure
-dnl for Geodynamics (http://geodynamics.org).
-dnl
-dnl Copyright (c) 2010-2023 University of California, Davis
-dnl
-dnl See LICENSE.md for license information.
-dnl
-dnl ----------------------------------------------------------------------
+dnl Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+dnl All rights reserved.
 dnl
+dnl See https://mit-license.org/ and LICENSE.md and for license information. 
+dnl ================================================================================================
 
 AC_PREREQ(2.59)
-AC_INIT([spatialdata], [3.1.0dev], [[email protected]])
+AC_INIT([spatialdata], [3.1.0], [[email protected]])
 AC_CONFIG_HEADER([portinfo])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/developer/headers.txt b/developer/headers.txt
@@ -0,0 +1,43 @@
+// =================================================================================================
+// This code is part of SpatialData, developed through the Computational Infrastructure
+// for Geodynamics (https://github.com/geodynamics/spatialdata).
+//
+// Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+// All rights reserved.
+//
+// See https://mit-license.org/ and LICENSE.md and for license information.
+// =================================================================================================
+
+# =================================================================================================
+# This code is part of SpatialData, developed through the Computational Infrastructure
+# for Geodynamics (https://github.com/geodynamics/spatialdata).
+#
+# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+# All rights reserved.
+#
+# See https://mit-license.org/ and LICENSE.md and for license information. 
+# =================================================================================================
+
+
+/*
+ * ================================================================================================
+ * This code is part of SpatialData, developed through the Computational Infrastructure
+ * for Geodynamics (https://github.com/geodynamics/spatialdata).
+ *
+ * Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+ * All rights reserved.
+ *
+ * See https://mit-license.org/ and LICENSE.md and for license information. 
+ * =================================================================================================
+ */
+
+
+dnl ================================================================================================
+dnl This code is part of SpatialData, developed through the Computational Infrastructure
+dnl for Geodynamics (https://github.com/geodynamics/spatialdata).
+dnl
+dnl Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+dnl All rights reserved.
+dnl
+dnl See https://mit-license.org/ and LICENSE.md and for license information. 
+dnl ================================================================================================
diff --git a/docs/Makefile.am b/docs/Makefile.am
@@ -1,19 +1,12 @@
-# -*- Makefile -*-
+# =================================================================================================
+# This code is part of SpatialData, developed through the Computational Infrastructure
+# for Geodynamics (https://github.com/geodynamics/spatialdata).
 #
-# ----------------------------------------------------------------------
+# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+# All rights reserved.
 #
-# Brad T. Aagaard, U.S. Geological Survey
-# Charles A. Williams, GNS Science
-# Matthew G. Knepley, University at Buffalo
-#
-# This code was developed as part of the Computational Infrastructure
-# for Geodynamics (http://geodynamics.org).
-#
-# Copyright (c) 2010-2023 University of California, Davis
-#
-# See LICENSE.md for license information.
-#
-# ----------------------------------------------------------------------
+# See https://mit-license.org/ and LICENSE.md and for license information. 
+# =================================================================================================
 #
 
 dist_noinst_DATA = \

diff --git a/docs/user/coordsys.md b/docs/user/coordsys.md
@@ -150,6 +150,10 @@ cs._configure()
 
 ## CSGeoLocal
 
+:::{note}
+New in v3.1.0.
+:::
+
 `CSGeoLocal` provides the flexibility of adding a local origin and rotation to a georeferenced coordinate system.
 As with `CSGeo`, we use [Proj](https://proj.maptools.org) to perform georeferenced coordinate system operations, so any geographic coordinate system supported by Proj can be used.
 See the [Proj documentation](https://proj.org/development/reference/functions.html#c.proj_create) for more information.

diff --git a/docs/user/spatialdb/analyticdb.md b/docs/user/spatialdb/analyticdb.md
@@ -1,5 +1,10 @@
 # AnalyticDB
 
+:::{note}
+New in v3.1.0.
+:::
+
+
 If the values for a field can be described by an analytic function, such as a polynomial `f(x) = a * x + b`, then you should use an `AnalyticDB`.
 In addition to the analytical expressions for the fields, you also need to provide the name and units for each field, and the coordinate system (the default is `CSCart`).
 

diff --git a/libsrc/Makefile.am b/libsrc/Makefile.am
@@ -1,18 +1,12 @@
-# -*- Makefile -*-
+# =================================================================================================
+# This code is part of SpatialData, developed through the Computational Infrastructure
+# for Geodynamics (https://github.com/geodynamics/spatialdata).
 #
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard, U.S. Geological Survey
-#
-# This code was developed as part of the Computational Infrastructure
-# for Geodynamics (http://geodynamics.org).
-#
-# Copyright (c) 2010-2023 University of California, Davis
-#
-# See LICENSE.md for license information.
-#
-# ----------------------------------------------------------------------
+# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+# All rights reserved.
 #
+# See https://mit-license.org/ and LICENSE.md and for license information. 
+# =================================================================================================
 
 SUBDIRS = \
 	spatialdata

diff --git a/libsrc/spatialdata/Makefile.am b/libsrc/spatialdata/Makefile.am
@@ -1,18 +1,12 @@
-# -*- Makefile -*-
+# =================================================================================================
+# This code is part of SpatialData, developed through the Computational Infrastructure
+# for Geodynamics (https://github.com/geodynamics/spatialdata).
 #
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard, U.S. Geological Survey
-#
-# This code was developed as part of the Computational Infrastructure
-# for Geodynamics (http://geodynamics.org).
-#
-# Copyright (c) 2010-2023 University of California, Davis
-#
-# See LICENSE.md for license information.
-#
-# ----------------------------------------------------------------------
+# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+# All rights reserved.
 #
+# See https://mit-license.org/ and LICENSE.md and for license information. 
+# =================================================================================================
 
 SUBDIRS = \
 	geocoords \

diff --git a/libsrc/spatialdata/geocoords/CSCart.cc b/libsrc/spatialdata/geocoords/CSCart.cc
@@ -1,18 +1,12 @@
-// -*- C++ -*-
+// =================================================================================================
+// This code is part of SpatialData, developed through the Computational Infrastructure
+// for Geodynamics (https://github.com/geodynamics/spatialdata).
 //
-// ----------------------------------------------------------------------
-//
-// Brad T. Aagaard, U.S. Geological Survey
-//
-// This code was developed as part of the Computational Infrastructure
-// for Geodynamics (http://geodynamics.org).
-//
-// Copyright (c) 2010-2023 University of California, Davis
-//
-// See LICENSE.md for license information.
-//
-// ----------------------------------------------------------------------
+// Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+// All rights reserved.
 //
+// See https://mit-license.org/ and LICENSE.md and for license information.
+// =================================================================================================
 
 #include <portinfo>
 

diff --git a/libsrc/spatialdata/geocoords/CSCart.hh b/libsrc/spatialdata/geocoords/CSCart.hh
@@ -1,31 +1,17 @@
-// -*- C++ -*-
+// =================================================================================================
+// This code is part of SpatialData, developed through the Computational Infrastructure
+// for Geodynamics (https://github.com/geodynamics/spatialdata).
 //
-// ----------------------------------------------------------------------
+// Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+// All rights reserved.
 //
-// Brad T. Aagaard, U.S. Geological Survey
-//
-// This code was developed as part of the Computational Infrastructure
-// for Geodynamics (http://geodynamics.org).
-//
-// Copyright (c) 2010-2023 University of California, Davis
-//
-// See LICENSE.md for license information.
-//
-// ----------------------------------------------------------------------
-//
-
-/** @file libsrc/geocoords/CSCart.hh
- *
- * @brief C++ CSCart object
- *
- * C++ object for managing parameters defining Cartesian coordinate systems.
- */
-
-#if !defined(spatialdata_geocoords_cscart_hh)
-#define spatialdata_geocoords_cscart_hh
+// See https://mit-license.org/ and LICENSE.md and for license information.
+// =================================================================================================
+#pragma once
 
 #include "CoordSys.hh" // ISA CoordSys
 
+/// C++ object for Cartesian coordinate system.
 class spatialdata::geocoords::CSCart : public CoordSys {
     friend class TestCSCart;
 
@@ -87,6 +73,4 @@ private:
 
 }; // class CSCart
 
-#endif // spatialdata_geocoodrs_cscart_hh
-
 // End of file
diff --git a/libsrc/spatialdata/geocoords/CSGeo.cc b/libsrc/spatialdata/geocoords/CSGeo.cc
@@ -1,18 +1,12 @@
-// -*- C++ -*-
+// =================================================================================================
+// This code is part of SpatialData, developed through the Computational Infrastructure
+// for Geodynamics (https://github.com/geodynamics/spatialdata).
 //
-// ----------------------------------------------------------------------
-//
-// Brad T. Aagaard, U.S. Geological Survey
-//
-// This code was developed as part of the Computational Infrastructure
-// for Geodynamics (http://geodynamics.org).
-//
-// Copyright (c) 2010-2023 University of California, Davis
-//
-// See LICENSE.md for license information.
-//
-// ----------------------------------------------------------------------
+// Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+// All rights reserved.
 //
+// See https://mit-license.org/ and LICENSE.md and for license information.
+// =================================================================================================
 
 #include <portinfo>