[cig-commits] commit 2468 by heister to /var/svn/dealii/aspect
dealii.demon at gmail.com
dealii.demon at gmail.com
Thu Apr 10 08:20:42 PDT 2014
Revision 2468
merge from mainline
_U branches/freesurface/
U branches/freesurface/CMakeLists.txt
U branches/freesurface/include/aspect/particle/world.h
U branches/freesurface/include/aspect/postprocess/composition_statistics.h
U branches/freesurface/source/postprocess/visualization.cc
U branches/freesurface/source/simulator/helper_functions.cc
U branches/freesurface/source/simulator/introspection.cc
A branches/freesurface/write_config.cmake
http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2468&peg=2468
Diff:
Index: branches/freesurface
===================================================================
--- branches/freesurface 2014-04-10 14:51:22 UTC (rev 2467)
+++ branches/freesurface 2014-04-10 15:20:40 UTC (rev 2468)
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-2460
+/trunk/aspect:2386-2467
\ No newline at end of property
Modified: branches/freesurface/CMakeLists.txt
===================================================================
--- branches/freesurface/CMakeLists.txt 2014-04-10 14:51:22 UTC (rev 2467)
+++ branches/freesurface/CMakeLists.txt 2014-04-10 15:20:40 UTC (rev 2468)
@@ -111,3 +111,10 @@
DEAL_II_INVOKE_AUTOPILOT()
+MESSAGE(STATUS "writing config into detailed.log...")
+LIST(APPEND CMAKE_MODULE_PATH
+ ${CMAKE_SOURCE_DIR}
+ )
+
+INCLUDE(write_config)
+
Modified: branches/freesurface/include/aspect/particle/world.h
===================================================================
--- branches/freesurface/include/aspect/particle/world.h 2014-04-10 14:51:22 UTC (rev 2467)
+++ branches/freesurface/include/aspect/particle/world.h 2014-04-10 15:20:40 UTC (rev 2468)
@@ -173,12 +173,12 @@
{
if (world_size) MPI_Type_free(&particle_type);
- if (num_send) delete num_send;
- if (num_recv) delete num_recv;
- if (send_offset) delete send_offset;
- if (recv_offset) delete recv_offset;
- if (send_reqs) delete send_reqs;
- if (recv_reqs) delete recv_reqs;
+ if (num_send) delete [] num_send;
+ if (num_recv) delete [] num_recv;
+ if (send_offset) delete [] send_offset;
+ if (recv_offset) delete [] recv_offset;
+ if (send_reqs) delete [] send_reqs;
+ if (recv_reqs) delete [] recv_reqs;
};
/**
@@ -385,9 +385,9 @@
if (res != MPI_SUCCESS) exit(-1);
// Delete temporary arrays
- delete old_types;
- delete indices;
- delete block_lens;
+ delete [] old_types;
+ delete [] indices;
+ delete [] block_lens;
// Initialize send/recv structures appropriately
num_send = new int[world_size];
Modified: branches/freesurface/include/aspect/postprocess/composition_statistics.h
===================================================================
--- branches/freesurface/include/aspect/postprocess/composition_statistics.h 2014-04-10 14:51:22 UTC (rev 2467)
+++ branches/freesurface/include/aspect/postprocess/composition_statistics.h 2014-04-10 15:20:40 UTC (rev 2468)
@@ -20,8 +20,8 @@
/* $Id$ */
-#ifndef __aspect__postprocess_temperature_statistics_h
-#define __aspect__postprocess_statistics_statistics_h
+#ifndef __aspect__postprocess_composition_statistics_h
+#define __aspect__postprocess_composition_statistics_h
#include <aspect/postprocess/interface.h>
#include <aspect/simulator_access.h>
Modified: branches/freesurface/source/postprocess/visualization.cc
===================================================================
--- branches/freesurface/source/postprocess/visualization.cc 2014-04-10 14:51:22 UTC (rev 2467)
+++ branches/freesurface/source/postprocess/visualization.cc 2014-04-10 15:20:40 UTC (rev 2468)
@@ -458,11 +458,13 @@
// assemble the error message completely, and then output it atomically
if (tmp_file_desc == -1)
{
- std::string x ("***** WARNING: could not create temporary file, will "
- "output directly to final location. This may negatively "
- "affect performance."
- " (On processor ");
- x += Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) + ".)
";
+ std::string x = std::string(
+ "***** WARNING: could not create temporary file, will "
+ "output directly to final location. This may negatively "
+ "affect performance. (On processor ")
+ + Utilities::int_to_string(
+ Utilities::MPI::this_mpi_process (MPI_COMM_WORLD))
+ + ".)
";
std::cerr << x << std::flush;
Modified: branches/freesurface/source/simulator/helper_functions.cc
===================================================================
--- branches/freesurface/source/simulator/helper_functions.cc 2014-04-10 14:51:22 UTC (rev 2467)
+++ branches/freesurface/source/simulator/helper_functions.cc 2014-04-10 15:20:40 UTC (rev 2468)
@@ -1057,7 +1057,7 @@
namespace aspect
{
#define INSTANTIATE(dim) \
- template class Simulator<dim>::TemperatureOrComposition; \
+ template struct Simulator<dim>::TemperatureOrComposition; \
template void Simulator<dim>::normalize_pressure(LinearAlgebra::BlockVector &vector); \
template void Simulator<dim>::denormalize_pressure(LinearAlgebra::BlockVector &vector); \
template double Simulator<dim>::get_maximal_velocity (const LinearAlgebra::BlockVector &solution) const; \
Modified: branches/freesurface/source/simulator/introspection.cc
===================================================================
--- branches/freesurface/source/simulator/introspection.cc 2014-04-10 14:51:22 UTC (rev 2467)
+++ branches/freesurface/source/simulator/introspection.cc 2014-04-10 15:20:40 UTC (rev 2468)
@@ -142,7 +142,7 @@
namespace aspect
{
#define INSTANTIATE(dim) \
- template class Introspection<dim>;\
+ template struct Introspection<dim>;\
ASPECT_INSTANTIATE(INSTANTIATE)
}
Copied: branches/freesurface/write_config.cmake (from rev 2467, trunk/aspect/write_config.cmake)
===================================================================
--- branches/freesurface/write_config.cmake (rev 0)
+++ branches/freesurface/write_config.cmake 2014-04-10 15:20:40 UTC (rev 2468)
@@ -0,0 +1,58 @@
+# Copyright (C) 2013, 2014 by the authors of the ASPECT code.
+#
+# This file is part of ASPECT.
+#
+# ASPECT is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# ASPECT is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ASPECT; see the file doc/COPYING. If not see
+# <http://www.gnu.org/licenses/>.
+
+# $Id: CMakeLists.txt 2387 2014-03-31 18:54:18Z bangerth $
+
+SET(_log_detailed "${CMAKE_BINARY_DIR}/detailed.log")
+FILE(REMOVE ${_log_detailed})
+
+MACRO(_detailed)
+ FILE(APPEND ${_log_detailed} "${ARGN}")
+ENDMACRO()
+
+_detailed(
+"###
+#
+# ASPECT configuration:
+# DEAL_II_DIR: ${deal.II_DIR}
+# DEAL_II VERSION: ${DEAL_II_PACKAGE_VERSION}
+# CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}
+# CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}
+# CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}
+# CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}
+# CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} on platform ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR}
+# ${CMAKE_CXX_COMPILER}
+")
+IF(CMAKE_C_COMPILER_WORKS)
+ _detailed("# CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}
")
+ENDIF()
+
+
+IF(DEAL_II_STATIC_EXECUTABLE)
+_detailed(
+"#
+# LINKAGE: STATIC
+")
+ELSE()
+_detailed(
+"#
+# LINKAGE: DYNAMIC
+")
+ENDIF()
+
+_detailed("#
###")
More information about the CIG-COMMITS
mailing list