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

dealii.demon at gmail.com dealii.demon at gmail.com
Wed Apr 16 06:39:24 PDT 2014 

Revision 2551

merge from mainline

_U  branches/freesurface/
U   branches/freesurface/CMakeLists.txt
U   branches/freesurface/doc/manual/manual.tex
U   branches/freesurface/doc/manual.pdf
A   branches/freesurface/doc/modules/0.3-to-1.0.h
U   branches/freesurface/doc/modules/changes.h
D   branches/freesurface/doc/papers/
U   branches/freesurface/doc/release-tasklist
U   branches/freesurface/readme.html
U   branches/freesurface/source/adiabatic_conditions.cc
U   branches/freesurface/source/boundary_composition/box.cc
U   branches/freesurface/source/boundary_composition/initial_composition.cc
U   branches/freesurface/source/boundary_composition/interface.cc
U   branches/freesurface/source/boundary_composition/spherical_constant.cc
U   branches/freesurface/source/boundary_temperature/box.cc
U   branches/freesurface/source/boundary_temperature/constant.cc
U   branches/freesurface/source/boundary_temperature/initial_temperature.cc
U   branches/freesurface/source/boundary_temperature/interface.cc
U   branches/freesurface/source/boundary_temperature/spherical_constant.cc
U   branches/freesurface/source/boundary_temperature/tan_gurnis.cc
U   branches/freesurface/source/compositional_initial_conditions/function.cc
U   branches/freesurface/source/compositional_initial_conditions/interface.cc
U   branches/freesurface/source/geometry_model/box.cc
U   branches/freesurface/source/geometry_model/interface.cc
U   branches/freesurface/source/geometry_model/sphere.cc
U   branches/freesurface/source/geometry_model/spherical_shell.cc
U   branches/freesurface/source/global.cc
U   branches/freesurface/source/gravity_model/interface.cc
U   branches/freesurface/source/gravity_model/radial.cc
U   branches/freesurface/source/gravity_model/vertical.cc
U   branches/freesurface/source/initial_conditions/adiabatic.cc
U   branches/freesurface/source/initial_conditions/box.cc
U   branches/freesurface/source/initial_conditions/function.cc
U   branches/freesurface/source/initial_conditions/harmonic_perturbation.cc
U   branches/freesurface/source/initial_conditions/interface.cc
U   branches/freesurface/source/initial_conditions/spherical_shell.cc
U   branches/freesurface/source/main.cc
U   branches/freesurface/source/material_model/duretz_et_al.cc
U   branches/freesurface/source/material_model/interface.cc
U   branches/freesurface/source/material_model/latent_heat.cc
U   branches/freesurface/source/material_model/simple.cc
U   branches/freesurface/source/material_model/steinberger.cc
U   branches/freesurface/source/material_model/table.cc
U   branches/freesurface/source/material_model/tan_gurnis.cc
U   branches/freesurface/source/mesh_refinement/composition.cc
U   branches/freesurface/source/mesh_refinement/density.cc
U   branches/freesurface/source/mesh_refinement/interface.cc
U   branches/freesurface/source/mesh_refinement/nonadiabatic_temperature.cc
U   branches/freesurface/source/mesh_refinement/temperature.cc
U   branches/freesurface/source/mesh_refinement/thermal_energy_density.cc
U   branches/freesurface/source/mesh_refinement/topography.cc
U   branches/freesurface/source/mesh_refinement/velocity.cc
U   branches/freesurface/source/mesh_refinement/viscosity.cc
U   branches/freesurface/source/particle/generator.cc
U   branches/freesurface/source/particle/integrator.cc
U   branches/freesurface/source/particle/output.cc
U   branches/freesurface/source/particle/particle.cc
U   branches/freesurface/source/postprocess/composition_statistics.cc
U   branches/freesurface/source/postprocess/depth_average.cc
U   branches/freesurface/source/postprocess/duretz_et_al.cc
U   branches/freesurface/source/postprocess/dynamic_topography.cc
U   branches/freesurface/source/postprocess/heat_flux_statistics.cc
U   branches/freesurface/source/postprocess/interface.cc
U   branches/freesurface/source/postprocess/table_heat_flux_statistics.cc
U   branches/freesurface/source/postprocess/table_velocity_statistics.cc
U   branches/freesurface/source/postprocess/tan_gurnis.cc
U   branches/freesurface/source/postprocess/temperature_statistics.cc
U   branches/freesurface/source/postprocess/tracer.cc
U   branches/freesurface/source/postprocess/velocity_statistics.cc
U   branches/freesurface/source/postprocess/visualization/artificial_viscosity.cc
U   branches/freesurface/source/postprocess/visualization/density.cc
U   branches/freesurface/source/postprocess/visualization/dynamic_topography.cc
U   branches/freesurface/source/postprocess/visualization/error_indicator.cc
U   branches/freesurface/source/postprocess/visualization/friction_heating.cc
U   branches/freesurface/source/postprocess/visualization/melt_fraction.cc
U   branches/freesurface/source/postprocess/visualization/nonadiabatic_pressure.cc
U   branches/freesurface/source/postprocess/visualization/nonadiabatic_temperature.cc
U   branches/freesurface/source/postprocess/visualization/partition.cc
U   branches/freesurface/source/postprocess/visualization/seismic_anomalies.cc
U   branches/freesurface/source/postprocess/visualization/seismic_vp.cc
U   branches/freesurface/source/postprocess/visualization/seismic_vs.cc
U   branches/freesurface/source/postprocess/visualization/specific_heat.cc
U   branches/freesurface/source/postprocess/visualization/strain_rate.cc
U   branches/freesurface/source/postprocess/visualization/thermal_expansivity.cc
U   branches/freesurface/source/postprocess/visualization/thermodynamic_phase.cc
U   branches/freesurface/source/postprocess/visualization/viscosity.cc
U   branches/freesurface/source/postprocess/visualization/viscosity_ratio.cc
U   branches/freesurface/source/postprocess/visualization.cc
U   branches/freesurface/source/simulator/assembly.cc
U   branches/freesurface/source/simulator/checkpoint_restart.cc
U   branches/freesurface/source/simulator/core.cc
U   branches/freesurface/source/simulator/helper_functions.cc
U   branches/freesurface/source/simulator/initial_conditions.cc
U   branches/freesurface/source/simulator/introspection.cc
U   branches/freesurface/source/simulator/nullspace.cc
U   branches/freesurface/source/simulator/parameters.cc
U   branches/freesurface/source/simulator/simulator_access.cc
U   branches/freesurface/source/simulator/solver.cc
U   branches/freesurface/source/termination_criteria/end_step.cc
U   branches/freesurface/source/termination_criteria/end_time.cc
U   branches/freesurface/source/termination_criteria/interface.cc
U   branches/freesurface/source/termination_criteria/steady_rms_velocity.cc
U   branches/freesurface/source/termination_criteria/user_request.cc
U   branches/freesurface/source/velocity_boundary_conditions/duretz_et_al.cc
U   branches/freesurface/source/velocity_boundary_conditions/function.cc
U   branches/freesurface/source/velocity_boundary_conditions/gplates.cc
U   branches/freesurface/source/velocity_boundary_conditions/interface.cc
U   branches/freesurface/source/velocity_boundary_conditions/zero_velocity.cc


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

Diff:
Index: branches/freesurface
===================================================================
--- branches/freesurface	2014-04-16 13:11:01 UTC (rev 2550)
+++ branches/freesurface	2014-04-16 13:39:22 UTC (rev 2551)

Property changes on: branches/freesurface
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/compositional:1141-1251
 /branches/fully-nonlinear:542-728
 /branches/j-dannberg:1679,1875-1882
-/trunk/aspect:2386-2513
+/trunk/aspect:2386-2550
\ No newline at end of property
Modified: branches/freesurface/CMakeLists.txt
===================================================================
--- branches/freesurface/CMakeLists.txt	2014-04-16 13:11:01 UTC (rev 2550)
+++ branches/freesurface/CMakeLists.txt	2014-04-16 13:39:22 UTC (rev 2551)
@@ -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/freesurface/doc/manual/manual.tex
===================================================================
--- branches/freesurface/doc/manual/manual.tex	2014-04-16 13:11:01 UTC (rev 2550)
+++ branches/freesurface/doc/manual/manual.tex	2014-04-16 13:39:22 UTC (rev 2551)
@@ -3,6 +3,7 @@
 \usepackage{amsmath}
 \usepackage{amsfonts}
 \usepackage{subfigure}
+\usepackage{textpos}
 
 % use a larger page size; otherwise, it is difficult to have complete
 % code listings and output on a single page
@@ -51,46 +52,117 @@
 
 egin{document}
 
-	hispagestyle{empty}
-space*{.2	extheight}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% START OF CIG MANUAL COVER TEMPLATE %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This should be pasted at the start of manuals and appropriate strings entered at locations indicated with FILL.
+% Be sure the TeX file includes the following packages.
+% \usepackage{graphicx}
+% \usepackage{times}
+% \usepackage{textpos}
 
-egin{centering}
-  \parindent0pt
-  \includegraphics[width=0.55	extwidth]{mesh-2d.png}
+\definecolor{dark_grey}{gray}{0.3}
+\definecolor{aspect_blue}{rgb}{0.3125,0.6875,0.9375}
 
-  fill
+%LINE 1%
+{
+
enewcommand{amilydefault}{\sfdefault}
 
-  {\huge spect{}}
-  \[.3cm]
-  {\Large
-    Advanced Solver for Problems in Earth's
-    ConvecTion}
-  \[.5cm]
-  {\large Preview release, version 0.4.pre\
-   (generated from subversion: $Revision$)}
-  \[1cm]
-  {\large
-    Wolfgang Bangerth\
-    Timo Heister\[24pt]
-  }
-\end{centering}
-{\parindent0pt
- \large
+\pagenumbering{gobble}
+egin{center}
+
esizebox{	extwidth}{!}{	extcolor{dark_grey}{ontfamily{\sfdefault}\selectfont
+COMPUTATIONAL INFRASTRUCTURE FOR GEODYNAMICS (CIG)
+}}
+
+\hrule
+
+%LINE 2%
+

More information about the CIG-COMMITS mailing list