[cig-commits] r1359 - in trunk/aspect: . include/aspect/material_model source/boundary_temperature source/compositional_initial_conditions source/gravity_model source/initial_conditions source/postprocess source/velocity_boundary_conditions
bangerth at dealii.org
bangerth at dealii.org
Sun Nov 11 14:47:16 PST 2012
Author: bangerth
Date: 2012-11-11 15:47:16 -0700 (Sun, 11 Nov 2012)
New Revision: 1359
Modified:
trunk/aspect/Makefile
trunk/aspect/include/aspect/material_model/interface.h
trunk/aspect/source/boundary_temperature/box.cc
trunk/aspect/source/boundary_temperature/spherical_constant.cc
trunk/aspect/source/boundary_temperature/tan_gurnis.cc
trunk/aspect/source/compositional_initial_conditions/function.cc
trunk/aspect/source/gravity_model/radial.cc
trunk/aspect/source/gravity_model/vertical.cc
trunk/aspect/source/initial_conditions/box.cc
trunk/aspect/source/initial_conditions/function.cc
trunk/aspect/source/initial_conditions/spherical_shell.cc
trunk/aspect/source/postprocess/depth_average.cc
trunk/aspect/source/postprocess/duretz_et_al.cc
trunk/aspect/source/postprocess/tan_gurnis.cc
trunk/aspect/source/velocity_boundary_conditions/duretz_et_al.cc
trunk/aspect/source/velocity_boundary_conditions/function.cc
trunk/aspect/source/velocity_boundary_conditions/gplates.cc
trunk/aspect/source/velocity_boundary_conditions/zero_velocity.cc
Log:
Fix a variety of warnings.
Modified: trunk/aspect/Makefile
===================================================================
--- trunk/aspect/Makefile 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/Makefile 2012-11-11 22:47:16 UTC (rev 1359)
@@ -1,156 +1,136 @@
-# $Id: Makefile.large 22840 2010-11-22 22:28:16Z bangerth $
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-# The large projects Makefile looks much like the one for small
-# projects. Basically, only the following seven parameters need to be
-# set by you:
+# Default target executed when no arguments are given to make.
+default_target: all
+.PHONY : default_target
-application-name = aspect
+#=============================================================================
+# Special targets provided by cmake.
-# The next variable tells us the name of the executable. It is prefixed by
-# `lib/' to designate its destination directory. Note that the program
-# name depends on the dimension, so you can keep copies for the
-# different dimensions around:
-target = lib/$(application-name)
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
-# The `debug-mode' variable works as in the small projects Makefile:
-debug-mode = on
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
-# And so does the following variable. You will have to set it to
-# something reasonable that, for example, includes the location where you
-# put output files that you want the `make clean' rule to delete
-clean-up-files =
+.SUFFIXES: .hpux_make_needs_suffix_list
-# Finally, here is a variable which tells the `run' rule which
-# parameters to pass to the executable. Usually, this will be the name
-# of an input file.
-run-parameters = parameter-file.prm
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
-# Now, this is the last variable you need to set, namely the path to
-# the deal.II toplevel directory:
-DEAL_DIR?=../../deal.II
-D = $(DEAL_DIR)
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+#=============================================================================
+# Set environment variables for the build.
+# The shell in which to execute make rules.
+SHELL = /bin/sh
-#
-#
-# Usually, you will not need to change anything beyond this point.
-#
-#
-# This tells `make' where to find the global settings and rules:
-include $D/common/Make.global_options
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
-# list the directories and the various kinds of files
-all-dirs := source \
- source/simulator \
- source/geometry_model \
- source/gravity_model \
- source/boundary_temperature \
- source/initial_conditions \
- source/compositional_initial_conditions \
- source/material_model \
- source/velocity_boundary_conditions \
- source/postprocess \
- source/postprocess/visualization
+# The program to use to edit the cache.
+CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-cc-files := $(shell for i in $(all-dirs) ; do echo $$i/*.cc ; done)
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/bangerth/p/deal.II/branch_cmake/projects/aspect
-tmp1 := $(shell echo $(cc-files) | $(PERL) -pi -e 's,source/,,g; s,/,_,g;')
-o-files := $(addprefix lib/obj/, $(tmp1:.cc=.$(OBJEXT)) )
-go-files := $(addprefix lib/obj/, $(tmp1:.cc=.g.$(OBJEXT)))
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/bangerth/p/deal.II/branch_cmake/projects/aspect
-h-files := $(wildcard include/aspect/*.h include/aspect/*/*h include/aspect/*/*/*h)
-lib-h-files := $(shell echo $D/include/deal.II/*/*.h)
+#=============================================================================
+# Targets provided globally by CMake.
-# As before, define two variables that denote the debug and optimized
-# versions of the deal.II libraries:
-libs.g := $(lib-deal2.g)
-libs.o := $(lib-deal2.o)
+# Special rule for the target edit_cache
+edit_cache:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+ /usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
-INCLUDE += -Iinclude
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+.PHONY : edit_cache/fast
+# Special rule for the target rebuild_cache
+rebuild_cache:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
-# Now use the information from above to define the set of libraries to
-# link with and the flags to be passed to the compiler:
-ifeq ($(debug-mode),on)
- libraries = $(go-files) $(libs.g)
- flags = $(CXXFLAGS.g)
-else
- libraries = $(o-files) $(libs.o)
- flags = $(CXXFLAGS.o)
-endif
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
+# The main all target
+all: cmake_check_build_system
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/bangerth/p/deal.II/branch_cmake/projects/aspect/CMakeFiles /home/bangerth/p/deal.II/branch_cmake/projects/aspect/CMakeFiles/progress.marks
+ $(MAKE) -f CMakeFiles/Makefile2 all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/bangerth/p/deal.II/branch_cmake/projects/aspect/CMakeFiles 0
+.PHONY : all
-# The following two rules define how to compile C++ files into object
-# files:
-lib/obj/%.g.$(OBJEXT) :
- @echo =====$(application-name)=============debug=====$(MT)== $<
- @$(CXX) $(flags) -c $< -o $@
-lib/obj/%.$(OBJEXT) :
- @echo =====$(application-name)=============optimized=$(MT)== $<
- @$(CXX) $(flags) -c $< -o $@
+# The main clean target
+clean:
+ $(MAKE) -f CMakeFiles/Makefile2 clean
+.PHONY : clean
+# The main clean target
+clean/fast: clean
+.PHONY : clean/fast
+# Prepare targets for installation.
+preinstall: all
+ $(MAKE) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall
-# Next define how to link the executable
-build : $(target)$(EXEEXT)
-$(target)$(EXEEXT) : $(libraries) Makefile
- @echo =====$(application-name)=======================$(MT)== Linking $@
- @$(CXX) -o $@ $(libraries) $(LIBS) $(LDFLAGS)
+# Prepare targets for installation.
+preinstall/fast:
+ $(MAKE) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall/fast
+# clear depends
+depend:
+ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+#=============================================================================
+# Target rules for targets named aspect
-# Rule how to run the program
-run: $(target)$(EXEEXT)
- ./$(target)$(EXEEXT) $(run-parameters)
+# Build rule for target.
+aspect: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 aspect
+.PHONY : aspect
-doc:
- @cd doc ; make
+# fast build rule for target.
+aspect/fast:
+ $(MAKE) -f source/CMakeFiles/aspect.dir/build.make source/CMakeFiles/aspect.dir/build
+.PHONY : aspect/fast
-indent:
- @echo "============ Indenting all files"
- @astyle --options=lib/astyle.rc $(h-files) $(cc-files)
+# Help Target
+help:
+ @echo "The following are some of the valid targets for this Makefile:"
+ @echo "... all (the default if no target is provided)"
+ @echo "... clean"
+ @echo "... depend"
+ @echo "... edit_cache"
+ @echo "... rebuild_cache"
+ @echo "... aspect"
+.PHONY : help
-.PHONY: run build doc indent
-# Rule how to clean up. This is split into several different rules to
-# allow for parallel execution of commands:
-clean: clean-lib clean-data
- -rm -f *~ */*~ */*/*~ source/Makefile.dep source/*/Makefile.dep
- -cd doc ; make clean
- -cd tests ; make clean
+#=============================================================================
+# Special targets to cleanup operation of make.
-clean-lib:
- -rm -f lib/obj/*.$(OBJEXT) $(target)$(EXEEXT) lib/TAGS
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
-clean-data:
- -rm -f $(clean-up-files)
-
-
-# Again tell `make' which rules are not meant to produce files:
-.PHONY: clean clean-data clean-lib run
-
-
-# Rule to generate the dependency files, one for each source
-# directory. These file are automagically remade whenever needed,
-# i.e. whenever one of the cc-/h-files changed. Make detects whether
-# to remake this file upon inclusion below.
-#
-# If the command fails, then remove Makefile.dep again and fail
-%/Makefile.dep: $(filter $(dir $@)%, $(cc-files)) \
- $(h-files) \
- $(lib-h-files) \
- Makefile
- @echo "====================================== Remaking $@"
- @(($D/common/scripts/make_dependencies -n $(INCLUDE) "-Blib/obj" \
- $(filter $(dir $@)%, $(cc-files)) \
- | $(PERL) -pe 's!debug/(.*)\.o:!$(subst source_,,$(subst /,_,$(dir $@)))\1.g.o:!g;' \
- | $(PERL) -pe 's!optimized/(.*)\.o:!$(subst source_,,$(subst /,_,$(dir $@)))\1.o:!g;' \
- ) > $@) \
- || (rm -f $@ ; false)
-
-
-# include all the dependencies
-include $(addsuffix /Makefile.dep, $(all-dirs))
Modified: trunk/aspect/include/aspect/material_model/interface.h
===================================================================
--- trunk/aspect/include/aspect/material_model/interface.h 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/include/aspect/material_model/interface.h 2012-11-11 22:47:16 UTC (rev 1359)
@@ -53,7 +53,7 @@
pressure,
strain_rate
};
- };
+ }
/**
Modified: trunk/aspect/source/boundary_temperature/box.cc
===================================================================
--- trunk/aspect/source/boundary_temperature/box.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/boundary_temperature/box.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -154,6 +154,6 @@
ASPECT_REGISTER_BOUNDARY_TEMPERATURE_MODEL(Box,
"box",
"A model in which the temperature is chosen constant on "
- "all the sides of a box.");
+ "all the sides of a box.")
}
}
Modified: trunk/aspect/source/boundary_temperature/spherical_constant.cc
===================================================================
--- trunk/aspect/source/boundary_temperature/spherical_constant.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/boundary_temperature/spherical_constant.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -129,6 +129,6 @@
"spherical constant",
"A model in which the temperature is chosen constant on "
"the inner and outer boundaries of a spherical shell. "
- "Parameters are read from subsection 'Sherical constant'.");
+ "Parameters are read from subsection 'Sherical constant'.")
}
}
Modified: trunk/aspect/source/boundary_temperature/tan_gurnis.cc
===================================================================
--- trunk/aspect/source/boundary_temperature/tan_gurnis.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/boundary_temperature/tan_gurnis.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -80,6 +80,6 @@
{
ASPECT_REGISTER_BOUNDARY_TEMPERATURE_MODEL(TanGurnis,
"Tan Gurnis",
- "A model for the Tan/Gurnis benchmark.");
+ "A model for the Tan/Gurnis benchmark.")
}
}
Modified: trunk/aspect/source/compositional_initial_conditions/function.cc
===================================================================
--- trunk/aspect/source/compositional_initial_conditions/function.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/compositional_initial_conditions/function.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -90,6 +90,6 @@
{
ASPECT_REGISTER_COMPOSITIONAL_INITIAL_CONDITIONS(Function,
"function",
- "Composition is given in terms of an explicit formula");
+ "Composition is given in terms of an explicit formula")
}
}
Modified: trunk/aspect/source/gravity_model/radial.cc
===================================================================
--- trunk/aspect/source/gravity_model/radial.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/gravity_model/radial.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -95,7 +95,7 @@
"radial constant",
"A gravity model in which the gravity direction is radially inward "
"and at constant magnitude. The magnitude is read from the parameter "
- "file in subsection 'Radial constant'.");
+ "file in subsection 'Radial constant'.")
ASPECT_REGISTER_GRAVITY_MODEL(RadialEarthLike,
"radial earth-like",
@@ -103,6 +103,6 @@
"and with a magnitude that matches that of the earth at "
"the core-mantle boundary as well as at the surface and "
"in between is physically correct under the assumption "
- "of a constant density.");
+ "of a constant density.")
}
}
Modified: trunk/aspect/source/gravity_model/vertical.cc
===================================================================
--- trunk/aspect/source/gravity_model/vertical.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/gravity_model/vertical.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -80,6 +80,6 @@
ASPECT_REGISTER_GRAVITY_MODEL(Vertical,
"vertical",
"A gravity model in which the gravity direction is vertically downward "
- "and at a constant magnitude by default equal to one.");
+ "and at a constant magnitude by default equal to one.")
}
}
Modified: trunk/aspect/source/initial_conditions/box.cc
===================================================================
--- trunk/aspect/source/initial_conditions/box.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/initial_conditions/box.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -60,6 +60,6 @@
"is perturbed slightly from an otherwise constant value "
"equal to one. The perturbation is chosen in such a way "
"that the initial temperature is constant to one along "
- "the entire boundary.");
+ "the entire boundary.")
}
}
Modified: trunk/aspect/source/initial_conditions/function.cc
===================================================================
--- trunk/aspect/source/initial_conditions/function.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/initial_conditions/function.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -81,6 +81,6 @@
{
ASPECT_REGISTER_INITIAL_CONDITIONS(Function,
"function",
- "Temperature is given in terms of an explicit formula");
+ "Temperature is given in terms of an explicit formula")
}
}
Modified: trunk/aspect/source/initial_conditions/spherical_shell.cc
===================================================================
--- trunk/aspect/source/initial_conditions/spherical_shell.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/initial_conditions/spherical_shell.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -232,7 +232,7 @@
"An initial temperature field in which the temperature "
"is perturbed following a six-fold pattern in angular "
"direction from an otherwise spherically symmetric "
- "state.");
+ "state.")
ASPECT_REGISTER_INITIAL_CONDITIONS(SphericalGaussianPerturbation,
"spherical gaussian perturbation",
@@ -240,6 +240,6 @@
"is perturbed by a single Gaussian added to an "
"otherwise spherically symmetric state. Additional "
"parameters are read from the parameter file in subsection "
- "'Spherical gaussian perturbation'.");
+ "'Spherical gaussian perturbation'.")
}
}
Modified: trunk/aspect/source/postprocess/depth_average.cc
===================================================================
--- trunk/aspect/source/postprocess/depth_average.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/postprocess/depth_average.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -69,7 +69,7 @@
return std::pair<std::string,std::string>();
const unsigned int n_statistics = 7+this->n_compositional_fields();
- std::vector<double> temp[n_statistics];
+ std::vector<std::vector<double> > temp(n_statistics);
{
unsigned int i = 0;
// add temperature and the compositional fields that follow
Modified: trunk/aspect/source/postprocess/duretz_et_al.cc
===================================================================
--- trunk/aspect/source/postprocess/duretz_et_al.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/postprocess/duretz_et_al.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -3078,6 +3078,6 @@
"and reports the error. Specifically, it can compute the errors for "
"the SolCx, SolKz and inclusion benchmarks. The postprocessor inquires "
"which material model is currently being used and adjusts "
- "which exact solution to use accordingly.");
+ "which exact solution to use accordingly.")
}
}
Modified: trunk/aspect/source/postprocess/tan_gurnis.cc
===================================================================
--- trunk/aspect/source/postprocess/tan_gurnis.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/postprocess/tan_gurnis.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -117,7 +117,6 @@
"Tan Gurnis error",
"A postprocessor that compares the solution of the benchmarks from "
"the Tan/Gurnis (2007) paper with the one computed by ASPECT "
- "by outputing data that is compared using a matlab script.");
+ "by outputing data that is compared using a matlab script.")
}
}
-
Modified: trunk/aspect/source/velocity_boundary_conditions/duretz_et_al.cc
===================================================================
--- trunk/aspect/source/velocity_boundary_conditions/duretz_et_al.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/velocity_boundary_conditions/duretz_et_al.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -79,7 +79,7 @@
"Implementation of the velocity boundary conditions for the "
"``inclusion'' benchmark. See the manual and the Kronbichler, Heister "
"and Bangerth paper on ASPECT for more information about this "
- "benchmark.");
+ "benchmark.")
}
}
}
Modified: trunk/aspect/source/velocity_boundary_conditions/function.cc
===================================================================
--- trunk/aspect/source/velocity_boundary_conditions/function.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/velocity_boundary_conditions/function.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -100,6 +100,6 @@
"Implementation of a model in which the boundary "
"velocity is given in terms of an explicit formula "
"that is elaborated in the parameters in section "
- "``Boundary velocity model|Function''.");
+ "``Boundary velocity model|Function''.")
}
}
Modified: trunk/aspect/source/velocity_boundary_conditions/gplates.cc
===================================================================
--- trunk/aspect/source/velocity_boundary_conditions/gplates.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/velocity_boundary_conditions/gplates.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -505,6 +505,6 @@
ASPECT_REGISTER_VELOCITY_BOUNDARY_CONDITIONS(GPlates,
"gplates",
"Implementation of a model in which the boundary "
- "velocity is derived from GPlates.");
+ "velocity is derived from GPlates.")
}
}
Modified: trunk/aspect/source/velocity_boundary_conditions/zero_velocity.cc
===================================================================
--- trunk/aspect/source/velocity_boundary_conditions/zero_velocity.cc 2012-11-11 21:44:24 UTC (rev 1358)
+++ trunk/aspect/source/velocity_boundary_conditions/zero_velocity.cc 2012-11-11 22:47:16 UTC (rev 1359)
@@ -49,6 +49,6 @@
"velocity is zero. This is commonly referred to as "
"a ``stick boundary condition'', indicating that "
"the material ``sticks'' to the material on the "
- "other side of the boundary.");
+ "other side of the boundary.")
}
}
More information about the CIG-COMMITS
mailing list