[cig-commits] [commit] master: Simplify a few introspection queries, remove some TODOs (96001ad)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu May 22 06:05:22 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/5b2b586a4f29499284711e77f2cb8d5a0bc64afe...80f462a3e073ac705f736fd43243a28f9833c866
>---------------------------------------------------------------
commit 96001ad5f62fc2aeb9771838fcd1ab605ef16975
Author: Jonathan Perry-Houts <jperryh2 at uoregon.edu>
Date: Thu May 22 00:32:04 2014 -0700
Simplify a few introspection queries, remove some TODOs
>---------------------------------------------------------------
96001ad5f62fc2aeb9771838fcd1ab605ef16975
source/mesh_refinement/density.cc | 1 -
source/mesh_refinement/nonadiabatic_temperature.cc | 1 -
source/mesh_refinement/viscosity.cc | 1 -
source/postprocess/visualization/density.cc | 2 +-
source/postprocess/visualization/friction_heating.cc | 2 +-
source/postprocess/visualization/melt_fraction.cc | 2 +-
source/postprocess/visualization/seismic_vp.cc | 2 +-
source/postprocess/visualization/seismic_vs.cc | 2 +-
source/postprocess/visualization/specific_heat.cc | 2 +-
source/postprocess/visualization/thermal_expansivity.cc | 2 +-
source/postprocess/visualization/thermodynamic_phase.cc | 2 +-
source/postprocess/visualization/viscosity.cc | 2 +-
source/postprocess/visualization/viscosity_ratio.cc | 2 +-
13 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/source/mesh_refinement/density.cc b/source/mesh_refinement/density.cc
index ab52dd0..6a1245b 100644
--- a/source/mesh_refinement/density.cc
+++ b/source/mesh_refinement/density.cc
@@ -122,7 +122,6 @@ namespace aspect
this->get_dof_handler(),
vec,
indicators,
-//TODO: replace by the appropriate component mask
this->introspection().component_indices.temperature);
// Scale gradient in each cell with the correct power of h. Otherwise,
diff --git a/source/mesh_refinement/nonadiabatic_temperature.cc b/source/mesh_refinement/nonadiabatic_temperature.cc
index 69a0d40..16005c5 100644
--- a/source/mesh_refinement/nonadiabatic_temperature.cc
+++ b/source/mesh_refinement/nonadiabatic_temperature.cc
@@ -98,7 +98,6 @@ namespace aspect
this->get_dof_handler(),
vec,
indicators,
- //TODO: replace by the appropriate component mask
this->introspection().component_indices.temperature);
// Scale gradient in each cell with the correct power of h. Otherwise,
diff --git a/source/mesh_refinement/viscosity.cc b/source/mesh_refinement/viscosity.cc
index c61c20f..6131750 100644
--- a/source/mesh_refinement/viscosity.cc
+++ b/source/mesh_refinement/viscosity.cc
@@ -120,7 +120,6 @@ namespace aspect
this->get_dof_handler(),
vec,
indicators,
-//TODO: replace by the appropriate component mask
this->introspection().component_indices.temperature);
// Scale gradient in each cell with the correct power of h. Otherwise,
diff --git a/source/postprocess/visualization/density.cc b/source/postprocess/visualization/density.cc
index 45c425f..6d37306 100644
--- a/source/postprocess/visualization/density.cc
+++ b/source/postprocess/visualization/density.cc
@@ -69,7 +69,7 @@ namespace aspect
in.temperature[q]=uh[q][this->introspection().component_indices.temperature];
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- in.composition[q][c] = uh[q][this->introspection().component_indices.compositional_fields[0]+c];
+ in.composition[q][c] = uh[q][this->introspection().component_indices.compositional_fields[c]];
}
this->get_material_model().evaluate(in, out);
diff --git a/source/postprocess/visualization/friction_heating.cc b/source/postprocess/visualization/friction_heating.cc
index 798ace8..4c532be 100644
--- a/source/postprocess/visualization/friction_heating.cc
+++ b/source/postprocess/visualization/friction_heating.cc
@@ -74,7 +74,7 @@ namespace aspect
in.temperature[q]=uh[q][this->introspection().component_indices.temperature];
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- in.composition[q][c] = uh[q][this->introspection().component_indices.compositional_fields[0]+c];
+ in.composition[q][c] = uh[q][this->introspection().component_indices.compositional_fields[c]];
}
diff --git a/source/postprocess/visualization/melt_fraction.cc b/source/postprocess/visualization/melt_fraction.cc
index a1b9533..66e0c07 100644
--- a/source/postprocess/visualization/melt_fraction.cc
+++ b/source/postprocess/visualization/melt_fraction.cc
@@ -64,7 +64,7 @@ namespace aspect
std::vector<double> composition(this->n_compositional_fields());
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- composition[c] = uh[q][this->introspection().component_indices.compositional_fields[0]+c];
+ composition[c] = uh[q][this->introspection().component_indices.compositional_fields[c]];
// anhydrous melting of peridotite after Katz, 2003
const double T_solidus = A1 + 273.15
diff --git a/source/postprocess/visualization/seismic_vp.cc b/source/postprocess/visualization/seismic_vp.cc
index fb1ff83..f089fd1 100644
--- a/source/postprocess/visualization/seismic_vp.cc
+++ b/source/postprocess/visualization/seismic_vp.cc
@@ -62,7 +62,7 @@ namespace aspect
const double temperature = uh[q][this->introspection().component_indices.temperature];
std::vector<double> composition(this->n_compositional_fields());
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- composition[c] = uh[q][this->introspection().component_indices.compositional_fields[0]+c];
+ composition[c] = uh[q][this->introspection().component_indices.compositional_fields[c]];
computed_quantities[q](0) = this->get_material_model().seismic_Vp(temperature,
pressure,
diff --git a/source/postprocess/visualization/seismic_vs.cc b/source/postprocess/visualization/seismic_vs.cc
index 183a709..8ab86ce 100644
--- a/source/postprocess/visualization/seismic_vs.cc
+++ b/source/postprocess/visualization/seismic_vs.cc
@@ -62,7 +62,7 @@ namespace aspect
const double temperature = uh[q][this->introspection().component_indices.temperature];
std::vector<double> composition(this->n_compositional_fields());
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- composition[c] = uh[q][this->introspection().component_indices.compositional_fields[0]+c];
+ composition[c] = uh[q][this->introspection().component_indices.compositional_fields[c]];
computed_quantities[q](0) = this->get_material_model().seismic_Vs(temperature,
pressure,
diff --git a/source/postprocess/visualization/specific_heat.cc b/source/postprocess/visualization/specific_heat.cc
index 118b07f..b00ba86 100644
--- a/source/postprocess/visualization/specific_heat.cc
+++ b/source/postprocess/visualization/specific_heat.cc
@@ -69,7 +69,7 @@ namespace aspect
in.temperature[q]=uh[q][this->introspection().component_indices.temperature];
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- in.composition[q][c] = uh[q][this->introspection().component_indices.compositional_fields[0]+c];
+ in.composition[q][c] = uh[q][this->introspection().component_indices.compositional_fields[c]];
}
this->get_material_model().evaluate(in, out);
diff --git a/source/postprocess/visualization/thermal_expansivity.cc b/source/postprocess/visualization/thermal_expansivity.cc
index f670db6..7876a7d 100644
--- a/source/postprocess/visualization/thermal_expansivity.cc
+++ b/source/postprocess/visualization/thermal_expansivity.cc
@@ -70,7 +70,7 @@ namespace aspect
in.temperature[q]=uh[q][this->introspection().component_indices.temperature];
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- in.composition[q][c] = uh[q][this->introspection().component_indices.compositional_fields[0]+c];
+ in.composition[q][c] = uh[q][this->introspection().component_indices.compositional_fields[c]];
}
diff --git a/source/postprocess/visualization/thermodynamic_phase.cc b/source/postprocess/visualization/thermodynamic_phase.cc
index f7463f6..d58d363 100644
--- a/source/postprocess/visualization/thermodynamic_phase.cc
+++ b/source/postprocess/visualization/thermodynamic_phase.cc
@@ -62,7 +62,7 @@ namespace aspect
const double temperature = uh[q][this->introspection().component_indices.temperature];
std::vector<double> composition(this->n_compositional_fields());
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- composition[c] = uh[q][this->introspection().component_indices.compositional_fields[0]+c];
+ composition[c] = uh[q][this->introspection().component_indices.compositional_fields[c]];
computed_quantities[q](0) = this->get_material_model().thermodynamic_phase(temperature,
pressure,
diff --git a/source/postprocess/visualization/viscosity.cc b/source/postprocess/visualization/viscosity.cc
index 2392eaa..bf22ee4 100644
--- a/source/postprocess/visualization/viscosity.cc
+++ b/source/postprocess/visualization/viscosity.cc
@@ -74,7 +74,7 @@ namespace aspect
in.temperature[q]=uh[q][this->introspection().component_indices.temperature];
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- in.composition[q][c] = uh[q][this->introspection().component_indices.compositional_fields[0]+c];
+ in.composition[q][c] = uh[q][this->introspection().component_indices.compositional_fields[c]];
}
this->get_material_model().evaluate(in, out);
diff --git a/source/postprocess/visualization/viscosity_ratio.cc b/source/postprocess/visualization/viscosity_ratio.cc
index e3ed171..92b809b 100644
--- a/source/postprocess/visualization/viscosity_ratio.cc
+++ b/source/postprocess/visualization/viscosity_ratio.cc
@@ -77,7 +77,7 @@ namespace aspect
std::vector<double> composition(this->n_compositional_fields());
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- composition[c] = uh[q][this->introspection().component_indices.compositional_fields[0]+c];
+ composition[c] = uh[q][this->introspection().component_indices.compositional_fields[c]];
computed_quantities[q](0) = this->get_material_model().viscosity_ratio(temperature,
pressure,
More information about the CIG-COMMITS
mailing list