[cig-commits] commit 2540 by heister to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 2540

take over r2537 through r2539

_U  branches/releases/aspect-1.0/
U   branches/releases/aspect-1.0/CMakeLists.txt
U   branches/releases/aspect-1.0/doc/release-tasklist
U   branches/releases/aspect-1.0/source/main.cc


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2540&peg=2540

Diff:
Index: branches/releases/aspect-1.0
===================================================================
--- branches/releases/aspect-1.0	2014-04-15 12:36:09 UTC (rev 2539)
+++ branches/releases/aspect-1.0	2014-04-15 12:51:22 UTC (rev 2540)

Property changes on: branches/releases/aspect-1.0
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/compositional:1141-1251
 /branches/fully-nonlinear:542-728
 /branches/j-dannberg:1679,1875-1882
-/trunk/aspect:2534
+/trunk/aspect:2534,2537-2539
\ No newline at end of property
Modified: branches/releases/aspect-1.0/CMakeLists.txt
===================================================================
--- branches/releases/aspect-1.0/CMakeLists.txt	2014-04-15 12:36:09 UTC (rev 2539)
+++ branches/releases/aspect-1.0/CMakeLists.txt	2014-04-15 12:51:22 UTC (rev 2540)
@@ -42,21 +42,25 @@
     )
 ENDIF()
 
+MESSAGE(STATUS "found deal.II version ${DEAL_II_PACKAGE_VERSION} at '${deal.II_DIR}'")
+
 IF(NOT DEAL_II_WITH_TRILINOS OR NOT DEAL_II_WITH_P4EST)
-  MESSAGE(FATAL_ERROR
-    "
Aspect requires a deal.II installation built with support for Trilinos and p4est but one or both of these appears to be missing!
"
-    )
   IF(NOT DEAL_II_WITH_TRILINOS)
-    MESSAGE(FATAL_ERROR
+    MESSAGE(SEND_ERROR
       "
-- deal.II was built without support for Trilinos!
"
       )
   ENDIF()
 
   IF(NOT DEAL_II_WITH_P4EST)
-    MESSAGE(FATAL_ERROR
+    MESSAGE(SEND_ERROR
       "
-- deal.II was built without support for p4est!
"
       )
   ENDIF()
+
+  MESSAGE(FATAL_ERROR
+    "
Aspect requires a deal.II installation built with support for Trilinos and p4est but one or both of these appears to be missing!
"
+    )
+
 ENDIF()
 
 DEAL_II_INITIALIZE_CACHED_VARIABLES()

Modified: branches/releases/aspect-1.0/doc/release-tasklist
===================================================================
--- branches/releases/aspect-1.0/doc/release-tasklist	2014-04-15 12:36:09 UTC (rev 2539)
+++ branches/releases/aspect-1.0/doc/release-tasklist	2014-04-15 12:51:22 UTC (rev 2540)
@@ -34,8 +34,8 @@
   . make sure the .prm and .xml files we ship match the default values
     of parameters
   . create a tar file: 
-    svn export https://svn.aspect.dealii.org/branches/releases/aspect-0.3 aspect-0.3
-    tar -czf aspect-0.3.tar.gz aspect-0.3/
+    svn export https://svn.aspect.dealii.org/branches/releases/aspect-1.0 aspect-1.0
+    tar -czf aspect-1.0.tar.gz aspect-1.0/
   . upload tar file (deal homepage svn in aspect/download)
   . link it on download.html (same location)
   . announce on

Modified: branches/releases/aspect-1.0/source/main.cc
===================================================================
--- branches/releases/aspect-1.0/source/main.cc	2014-04-15 12:36:09 UTC (rev 2539)
+++ branches/releases/aspect-1.0/source/main.cc	2014-04-15 12:51:22 UTC (rev 2540)
@@ -197,13 +197,14 @@
                     << std::endl;
         }
 
+      if (argc < 2)
+        {
+          std::cout << "	Usage: ./aspect <parameter_file.prm>" << std::endl;
+          return 0;
+        }
 
       // see which parameter file to use
-      std::string parameter_filename;
-      if (argc >= 2)
-        parameter_filename = argv[1];
-      else
-        parameter_filename = "box.prm";
+      std::string parameter_filename = argv[1];
 
       // verify that it can be opened
       {