[cig-commits] r1292 - in branches/active_compositions: include/aspect/material_model source/postprocess source/simulator
dannberg at dealii.org
dannberg at dealii.org
Thu Oct 18 15:01:29 PDT 2012
Author: dannberg
Date: 2012-10-18 16:01:29 -0600 (Thu, 18 Oct 2012)
New Revision: 1292
Modified:
branches/active_compositions/include/aspect/material_model/interface.h
branches/active_compositions/source/postprocess/heat_flux_statistics.cc
branches/active_compositions/source/postprocess/table_heat_flux_statistics.cc
branches/active_compositions/source/simulator/assembly.cc
branches/active_compositions/source/simulator/core.cc
branches/active_compositions/source/simulator/helper_functions.cc
Log:
Find >> and Replace with > >
Modified: branches/active_compositions/include/aspect/material_model/interface.h
===================================================================
--- branches/active_compositions/include/aspect/material_model/interface.h 2012-10-18 21:49:31 UTC (rev 1291)
+++ branches/active_compositions/include/aspect/material_model/interface.h 2012-10-18 22:01:29 UTC (rev 1292)
@@ -415,11 +415,11 @@
{
MaterialModelInputs(unsigned int n_points, unsigned int n_comp);
- std::vector<Point<dim>> position;
+ std::vector<Point<dim> > position;
std::vector<double> temperature;
std::vector<double> pressure;
- std::vector<std::vector<double>> composition;
- std::vector<SymmetricTensor<2,dim>> strain_rate;
+ std::vector<std::vector<double> > composition;
+ std::vector<SymmetricTensor<2,dim> > strain_rate;
};
struct MaterialModelOutputs
Modified: branches/active_compositions/source/postprocess/heat_flux_statistics.cc
===================================================================
--- branches/active_compositions/source/postprocess/heat_flux_statistics.cc 2012-10-18 21:49:31 UTC (rev 1291)
+++ branches/active_compositions/source/postprocess/heat_flux_statistics.cc 2012-10-18 22:01:29 UTC (rev 1292)
@@ -64,7 +64,7 @@
std::vector<Tensor<1,dim> > temperature_gradients (quadrature_formula.size());
std::vector<double> temperature_values (quadrature_formula.size());
std::vector<double> pressure_values (quadrature_formula.size());
- std::vector<std::vector<double>> composition_values (this->n_compositional_fields(),std::vector<double> (quadrature_formula.size()));
+ std::vector<std::vector<double> > composition_values (this->n_compositional_fields(),std::vector<double> (quadrature_formula.size()));
std::vector<double> composition_values_at_q_point (this->n_compositional_fields());
std::map<types::boundary_id_t, double> local_boundary_fluxes;
Modified: branches/active_compositions/source/postprocess/table_heat_flux_statistics.cc
===================================================================
--- branches/active_compositions/source/postprocess/table_heat_flux_statistics.cc 2012-10-18 21:49:31 UTC (rev 1291)
+++ branches/active_compositions/source/postprocess/table_heat_flux_statistics.cc 2012-10-18 22:01:29 UTC (rev 1292)
@@ -63,7 +63,7 @@
std::vector<Tensor<1,dim> > temperature_gradients (quadrature_formula.size());
std::vector<double> temperature_values (quadrature_formula.size());
std::vector<double> pressure_values (quadrature_formula.size());
- std::vector<std::vector<double>> composition_values (this->n_compositional_fields(),std::vector<double> (quadrature_formula.size()));
+ std::vector<std::vector<double> > composition_values (this->n_compositional_fields(),std::vector<double> (quadrature_formula.size()));
std::vector<double> composition_values_at_q_point (this->n_compositional_fields());
Modified: branches/active_compositions/source/simulator/assembly.cc
===================================================================
--- branches/active_compositions/source/simulator/assembly.cc 2012-10-18 21:49:31 UTC (rev 1291)
+++ branches/active_compositions/source/simulator/assembly.cc 2012-10-18 22:01:29 UTC (rev 1292)
@@ -61,7 +61,7 @@
std::vector<double> temperature_values;
std::vector<double> pressure_values;
std::vector<SymmetricTensor<2,dim> > strain_rates;
- std::vector<std::vector<double>> composition_values;
+ std::vector<std::vector<double> > composition_values;
typename MaterialModel::Interface<dim>::MaterialModelInputs material_model_inputs;
typename MaterialModel::Interface<dim>::MaterialModelOutputs material_model_outputs;
@@ -142,7 +142,7 @@
std::vector<SymmetricTensor<2,dim> > grads_phi_u;
std::vector<double> div_phi_u;
std::vector<Tensor<1,dim> > velocity_values;
- std::vector<std::vector<double>> composition_values;
+ std::vector<std::vector<double> > composition_values;
typename MaterialModel::Interface<dim>::MaterialModelInputs material_model_inputs;
typename MaterialModel::Interface<dim>::MaterialModelOutputs material_model_outputs;
@@ -219,14 +219,14 @@
std::vector<double> old_temperature_laplacians;
std::vector<double> old_old_temperature_laplacians;
- std::vector<std::vector<double>> old_composition_values;
- std::vector<std::vector<double>> old_old_composition_values;
+ std::vector<std::vector<double> > old_composition_values;
+ std::vector<std::vector<double> > old_old_composition_values;
std::vector<double> current_temperature_values;
std::vector<Tensor<1,dim> > current_velocity_values;
std::vector<SymmetricTensor<2,dim> > current_strain_rates;
std::vector<double> current_pressure_values;
- std::vector<std::vector<double>> current_composition_values;
+ std::vector<std::vector<double> > current_composition_values;
typename MaterialModel::Interface<dim>::MaterialModelInputs material_model_inputs;
@@ -667,8 +667,8 @@
const std::vector<SymmetricTensor<2,dim> > &old_old_strain_rates,
const std::vector<double> &old_pressure,
const std::vector<double> &old_old_pressure,
- const std::vector<std::vector<double>> &old_composition,
- const std::vector<std::vector<double>> &old_old_composition,
+ const std::vector<std::vector<double> > &old_composition,
+ const std::vector<std::vector<double> > &old_old_composition,
const double average_temperature,
const std::vector<Point<dim> > &evaluation_points,
double &max_residual,
@@ -837,8 +837,8 @@
const std::vector<SymmetricTensor<2,dim> > &old_old_strain_rates,
const std::vector<double> &old_pressure,
const std::vector<double> &old_old_pressure,
- const std::vector<std::vector<double>> &old_composition,
- const std::vector<std::vector<double>> &old_old_composition,
+ const std::vector<std::vector<double> > &old_composition,
+ const std::vector<std::vector<double> > &old_old_composition,
const double global_u_infty,
const double global_T_variation,
const double average_field,
@@ -953,7 +953,7 @@
// the values of the compositional fields are stored as blockvectors for each field
// we have to extract them in this structure
- std::vector<std::vector<double>> composition_values (parameters.n_compositional_fields,
+ std::vector<std::vector<double> > composition_values (parameters.n_compositional_fields,
std::vector<double> (n_q_points));
for(unsigned int i=0;i<parameters.n_compositional_fields;++i)
@@ -1689,8 +1689,8 @@
std::vector<SymmetricTensor<2,dim> >(), //strain rate
std::vector<double>(), //we also do not need the pressure
std::vector<double>(), //pressure
- std::vector<std::vector<double>> (), //we also do not need the other compositional fields
- std::vector<std::vector<double>> (), //other compositional fields
+ std::vector<std::vector<double> > (), //we also do not need the other compositional fields
+ std::vector<std::vector<double> > (), //other compositional fields
global_max_velocity,
global_C_range.second - global_C_range.first,
0.5 * (global_C_range.second + global_C_range.first),
Modified: branches/active_compositions/source/simulator/core.cc
===================================================================
--- branches/active_compositions/source/simulator/core.cc 2012-10-18 21:49:31 UTC (rev 1291)
+++ branches/active_compositions/source/simulator/core.cc 2012-10-18 22:01:29 UTC (rev 1292)
@@ -831,9 +831,9 @@
// the values of the compositional fields are stored as blockvectors for each field
// we have to extract them in this structure
- std::vector<std::vector<double>> prelim_composition_values (parameters.n_compositional_fields,
+ std::vector<std::vector<double> > prelim_composition_values (parameters.n_compositional_fields,
std::vector<double> (quadrature.size()));
- std::vector<std::vector<double>> composition_values (quadrature.size(),
+ std::vector<std::vector<double> > composition_values (quadrature.size(),
std::vector<double> (parameters.n_compositional_fields));
Modified: branches/active_compositions/source/simulator/helper_functions.cc
===================================================================
--- branches/active_compositions/source/simulator/helper_functions.cc 2012-10-18 21:49:31 UTC (rev 1291)
+++ branches/active_compositions/source/simulator/helper_functions.cc 2012-10-18 22:01:29 UTC (rev 1292)
@@ -255,7 +255,7 @@
template <int dim>
- void Simulator<dim>::extract_composition_values_at_q_point (const std::vector<std::vector<double>> &composition_values,
+ void Simulator<dim>::extract_composition_values_at_q_point (const std::vector<std::vector<double> > &composition_values,
const unsigned int q,
std::vector<double> &composition_values_at_q_point) const
{
@@ -636,7 +636,7 @@
std::vector<SymmetricTensor<2,dim> > strain_rates(n_q_points);
std::vector<double> pressure_values(n_q_points);
std::vector<double> temperature_values(n_q_points);
- std::vector<std::vector<double>> composition_values (parameters.n_compositional_fields,std::vector<double> (n_q_points));
+ std::vector<std::vector<double> > composition_values (parameters.n_compositional_fields,std::vector<double> (n_q_points));
std::vector<double> composition_values_at_q_point (parameters.n_compositional_fields);
typename DoFHandler<dim>::active_cell_iterator
@@ -836,7 +836,7 @@
}
std::vector<double> pressure_values(n_q_points);
- std::vector<std::vector<double>> composition_values (parameters.n_compositional_fields,std::vector<double> (n_q_points));
+ std::vector<std::vector<double> > composition_values (parameters.n_compositional_fields,std::vector<double> (n_q_points));
std::vector<double> composition_values_at_q_point (parameters.n_compositional_fields);
typename DoFHandler<dim>::active_cell_iterator
@@ -917,7 +917,7 @@
}
std::vector<double> pressure_values(n_q_points);
- std::vector<std::vector<double>> composition_values (parameters.n_compositional_fields,std::vector<double> (n_q_points));
+ std::vector<std::vector<double> > composition_values (parameters.n_compositional_fields,std::vector<double> (n_q_points));
std::vector<double> composition_values_at_q_point (parameters.n_compositional_fields);
typename DoFHandler<dim>::active_cell_iterator
@@ -999,7 +999,7 @@
std::vector<double> pressure_values(n_q_points);
std::vector<double> temperature_values(n_q_points);
- std::vector<std::vector<double>> composition_values (parameters.n_compositional_fields,std::vector<double> (n_q_points));
+ std::vector<std::vector<double> > composition_values (parameters.n_compositional_fields,std::vector<double> (n_q_points));
std::vector<double> composition_values_at_q_point (parameters.n_compositional_fields);
typename DoFHandler<dim>::active_cell_iterator
@@ -1074,7 +1074,7 @@
std::vector<double> pressure_values(n_q_points);
std::vector<double> temperature_values(n_q_points);
- std::vector<std::vector<double>> composition_values (parameters.n_compositional_fields,std::vector<double> (n_q_points));
+ std::vector<std::vector<double> > composition_values (parameters.n_compositional_fields,std::vector<double> (n_q_points));
std::vector<double> composition_values_at_q_point (parameters.n_compositional_fields);
typename DoFHandler<dim>::active_cell_iterator
@@ -1118,7 +1118,7 @@
template void Simulator<dim>::normalize_pressure(LinearAlgebra::BlockVector &vector); \
template double Simulator<dim>::get_maximal_velocity (const LinearAlgebra::BlockVector &solution) const; \
template std::pair<double,double> Simulator<dim>::get_extrapolated_temperature_or_composition_range (const unsigned int index) const; \
- template void Simulator<dim>::extract_composition_values_at_q_point (const std::vector<std::vector<double>> &composition_values, \
+ template void Simulator<dim>::extract_composition_values_at_q_point (const std::vector<std::vector<double> > &composition_values, \
const unsigned int q, \
std::vector<double> &composition_values_at_q_point) const; \
template double Simulator<dim>::compute_time_step () const; \
More information about the CIG-COMMITS
mailing list