switch website

CITATION

@@ -1,5 +1,5 @@
 Please open
 
-    https://aspect.geodynamics.org/cite.html
+    https://aspect.geodynamics.org/citing.html&src=citation
 
 for information on how to cite ASPECT.

include/aspect/citation_info.h

@@ -30,14 +30,14 @@
 namespace CitationInfo
 {
   /**
-   * Get the URL in the format "cite.html?(parameters)" that describes how to
+   * Get the URL in the format "citing.html?(parameters)" that describes how to
    * cite ASPECT based on the current model you are running.
    */
   const std::string get_url_part ();
 
   /**
    * Add the paper identified by the given id to the currently used list of
-   * papers. See cite.html for the list of ids. For specific features inside
+   * papers. See citing.html for the list of ids. For specific features inside
    * ASPECT that have associated publications, call this function if the
    * feature is used in the current computation. For example, if the
    * computation requires melt migration, call <tt>add("melt")</tt>.
@@ -53,7 +53,7 @@ namespace CitationInfo
   {
     stream << "-----------------------------------------------------------------------------\n"
            << "-- For information on how to cite ASPECT, see:\n"
-           << "--   https://geodynamics.github.io/aspect/" << get_url_part() << "\n"
+           << "--   https://aspect.geodynamics.org/" << get_url_part() << "\n"
            << "-----------------------------------------------------------------------------"
            << std::endl;
   }

source/citation_info.cc

@@ -31,16 +31,19 @@ namespace CitationInfo
   const std::string get_url_part ()
   {
     // version:
-    std::string url = "cite.html?ver=";
+    std::string url = "citing.html?ver=";
     url += ASPECT_PACKAGE_VERSION;
 
+    // all ids:
+    for (const auto &id : citation_ids)
+      url += "&" + id + "=1";
+
     // sha1:
     url += "&sha=";
     url += ASPECT_GIT_SHORTREV;
 
-    // all ids:
-    for (const auto &id : citation_ids)
-      url += "&" + id + "=1";
+    // src:
+    url += "&src=code";
 
     return url;
   }

unit_tests/first.cc

@@ -77,9 +77,9 @@ TEST_CASE("function parser if() and division by zero")
 TEST_CASE("citation test")
 {
   using namespace aspect;
-  REQUIRE_THAT(CitationInfo::get_url_part(), StartsWith("cite.html?ver="));
+  REQUIRE_THAT(CitationInfo::get_url_part(), StartsWith("citing.html?ver="));
   CitationInfo::add("bla");
-  REQUIRE_THAT(CitationInfo::get_url_part(), StartsWith("cite.html?ver="));
+  REQUIRE_THAT(CitationInfo::get_url_part(), StartsWith("citing.html?ver="));
   REQUIRE_THAT(CitationInfo::get_url_part(), Contains("bla=1"));
   REQUIRE_THAT(CitationInfo::get_url_part(), !Contains("blub"));
   CitationInfo::add("blub");