[cig-commits] [commit] master: various latex formatting fixes (7ab1bc3)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Sun Jul 13 13:09:02 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/4ed2ed64db642ac99fabd74cee952841ab1a7372...35604e858b058ef0e2cef147bc43fc8a3a445a98
>---------------------------------------------------------------
commit 7ab1bc37177b33aa6e204640533dd1d1e243d5d8
Author: Timo Heister <timo.heister at gmail.com>
Date: Sat Jul 12 13:14:35 2014 -0700
various latex formatting fixes
>---------------------------------------------------------------
7ab1bc37177b33aa6e204640533dd1d1e243d5d8
doc/update_parameters.sh | 5 +++++
source/initial_conditions/S40RTS_perturbation.cc | 2 +-
source/material_model/latent_heat_melt.cc | 6 +++---
source/postprocess/visualization/melt_fraction.cc | 6 +++---
source/velocity_boundary_conditions/gplates.cc | 4 +++-
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/doc/update_parameters.sh b/doc/update_parameters.sh
index 4b03cf1..0919131 100755
--- a/doc/update_parameters.sh
+++ b/doc/update_parameters.sh
@@ -13,6 +13,11 @@ sed -i 's/<\.\/myplugin.so>/$<$\.\/myplugin.so$>$/g' parameters.tex
sed -i 's/<\[/\[/g' parameters.tex
sed -i 's/\]>/\]/g' parameters.tex
sed -i 's/dynamic_topography.NNNNN/dynamic\\_topography.NNNNN/g' parameters.tex
+sed -i 's/Spline_knots.txt/Spline\\_knots.txt/g' parameters.tex
+sed -i 's/melt_fraction/melt\\_fraction/g' parameters.tex
+sed -i 's/phi\.%d/phi\.\\%d/g' parameters.tex
+
+grep '[^\\]%' parameters.tex
cd ..
echo done
\ No newline at end of file
diff --git a/source/initial_conditions/S40RTS_perturbation.cc b/source/initial_conditions/S40RTS_perturbation.cc
index 093e69f..4d36846 100644
--- a/source/initial_conditions/S40RTS_perturbation.cc
+++ b/source/initial_conditions/S40RTS_perturbation.cc
@@ -632,7 +632,7 @@ namespace aspect
"velocity model by Ritsema and others, which can be downloaded "
"here \\url{http://www.earth.lsa.umich.edu/~jritsema/research.html}. "
"Information on the vs model can be found in Ritsema, J., Deuss, "
- "A., van Heijst, H.J. & Woodhouse, J.H., 2011. S40RTS: a "
+ "A., van Heijst, H.J. \\& Woodhouse, J.H., 2011. S40RTS: a "
"degree-40 shear-velocity model for the mantle from new Rayleigh "
"wave dispersion, teleseismic traveltime and normal-mode "
"splitting function measurements, Geophys. J. Int. 184, 1223-1236. "
diff --git a/source/material_model/latent_heat_melt.cc b/source/material_model/latent_heat_melt.cc
index c67a815..307b999 100644
--- a/source/material_model/latent_heat_melt.cc
+++ b/source/material_model/latent_heat_melt.cc
@@ -494,11 +494,11 @@ namespace aspect
"Units: $J/kg/K$.");
prm.declare_entry ("Thermal expansion coefficient", "4e-5",
Patterns::Double (0),
- "The value of the thermal expansion coefficient $\\alpha_s. "
+ "The value of the thermal expansion coefficient $\\alpha_s$. "
"Units: $1/K$.");
prm.declare_entry ("Thermal expansion coefficient of melt", "6.8e-5",
Patterns::Double (0),
- "The value of the thermal expansion coefficient $\\alpha_f. "
+ "The value of the thermal expansion coefficient $\\alpha_f$. "
"Units: $1/K$.");
prm.declare_entry ("Compressibility", "5.124e-12",
Patterns::Double (0),
@@ -726,7 +726,7 @@ namespace aspect
"parameterization of hydrous mantle melting) and the one for "
"pyroxenite from Sobolev et al., 2011 (Linking mantle plumes, "
"large igneous provinces and environmental catastrophes). "
- "The model assumes a constant entropy change for melting 100% "
+ "The model assumes a constant entropy change for melting 100\\% "
"of the material, which can be specified in the input file. "
"The partial derivatives of entropy with respect to temperature "
"and pressure required for calculating the latent heat consumption "
diff --git a/source/postprocess/visualization/melt_fraction.cc b/source/postprocess/visualization/melt_fraction.cc
index 2dce843..d055bba 100644
--- a/source/postprocess/visualization/melt_fraction.cc
+++ b/source/postprocess/visualization/melt_fraction.cc
@@ -318,10 +318,10 @@ namespace aspect
"can be changed in the input file, the most relevant maybe "
"being the mass fraction of Cpx in peridotite in the Katz "
"melting model (Mass fraction cpx), which right now has a "
- "default of 15%. "
+ "default of 15\\%. "
"The corresponding p-T-diagrams can be generated by running "
- "the tests melt_postprocessor_peridotite and "
- "melt_postprocessor_pyroxenite.")
+ "the tests melt\\_postprocessor\\_peridotite and "
+ "melt\\_postprocessor\\_pyroxenite.")
}
}
}
diff --git a/source/velocity_boundary_conditions/gplates.cc b/source/velocity_boundary_conditions/gplates.cc
index a3b7504..132f3ee 100644
--- a/source/velocity_boundary_conditions/gplates.cc
+++ b/source/velocity_boundary_conditions/gplates.cc
@@ -743,7 +743,9 @@ namespace aspect
"files located in the 'data/' subdirectory of ASPECT. ");
prm.declare_entry ("Velocity file name", "phi.%d",
Patterns::Anything (),
- "The file name of the material data. Provide file in format: (Velocity file name).%d.gpml where %d is any sprintf integer qualifier, specifying the format of the current file number.");
+ "The file name of the material data. Provide file in format: "
+ "(Velocity file name).\\%d.gpml where \\%d is any sprintf integer "
+ "qualifier, specifying the format of the current file number.");
prm.declare_entry ("Time step", "1e6",
Patterns::Double (0),
"Time step between following velocity files. "
More information about the CIG-COMMITS
mailing list