From 914bb713cd91d4f071490e7cd4b26174b8aa5964 Mon Sep 17 00:00:00 2001 From: Shangxin Liu Date: Fri, 12 May 2017 14:51:22 -0400 Subject: [PATCH 1/2] fix several typos in the comments of geoid --- doc/modules/changes/20170511_Shangxin-Liu | 8 ++++---- source/postprocess/geoid.cc | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/modules/changes/20170511_Shangxin-Liu b/doc/modules/changes/20170511_Shangxin-Liu index 0c48818608f..f12dfa60ff7 100644 --- a/doc/modules/changes/20170511_Shangxin-Liu +++ b/doc/modules/changes/20170511_Shangxin-Liu @@ -1,7 +1,7 @@ New: ASPECT can now compute geoid in 3D spherical shell geometry. -The calculation is based on spherical harmonics from min to max degree and -the final results are transferred into cartesian coordinates. The users can -also choose to output the spherical harmonics of geoid, density contribution part, -surface dynamic topography part, and CMB dynamic topography part respectively. +The calculation is based on spherical harmonics from min to max degree and the +final results are transferred into cartesian coordinates. The users can also choose +to output the spherical harmonics of geoid, density contribution part, surface dynamic +topography contribution part, and CMB dynamic topography contribution part respectively.
(Shangxin Liu and Ian Rose, 2017/05/11) diff --git a/source/postprocess/geoid.cc b/source/postprocess/geoid.cc index 43270e5ecd6..28780789252 100644 --- a/source/postprocess/geoid.cc +++ b/source/postprocess/geoid.cc @@ -917,13 +917,13 @@ namespace aspect { prm.declare_entry("Maximum degree","20", Patterns::Integer (0), - "This parameter can be a random positive integral. However, the value normally should not exceed the maximum" - "degree of the initial perturbed temperature field. For example, if the initial condition uses S40RTS, the" + "This parameter can be a random positive integer. However, the value normally should not exceed the maximum" + "degree of the initial perturbed temperature field. For example, if the initial temperature uses S40RTS, the" "maximun degree should not be larger than 40."); prm.declare_entry("Minimum degree","2", Patterns::Integer (0), "This parameter normally is set to 2 since the perturbed gravitational potential at degree 1 always vanishes" - "in a reference frame with the planetary center of mass as the center of the reference frame."); + "in a reference frame with the planetary center of mass same as the center of figure."); prm.declare_entry("Output data in geographical coordinates", "false", Patterns::Bool(), "Option to output the geoid anomaly in geographical coordinates (latitude and longitude). " @@ -937,7 +937,7 @@ namespace aspect prm.declare_entry("Also output the spherical harmonic coefficients of geoid anomaly", "false", Patterns::Bool(), "Option to also output the spherical harmonic coefficients of the geoid anomaly up to the maximum degree. " - "The default is false, so postprocess will only output the grid geoid anomaly. "); + "The default is false, so postprocess will only output the geoid anomaly in grid format. "); prm.declare_entry("Also output the spherical harmonic coefficients of surface dynamic topography contribution", "false", Patterns::Bool(), "Option to also output the spherical harmonic coefficients of the surface dynamic topography contribution " @@ -993,7 +993,7 @@ namespace aspect "A postprocessor that computes a measure of geoid anomaly based on the density anomaly determined " "from the temperature field in the mantle, and the dynamic topography at the surface and core mantle " "boundary(CMB). The geoid is computed from the spherical harmonics expansion, so the geometry of the " - "domain needs to be a spherical shell.") + "domain needs to be a 3D spherical shell.") } } From 3abe765ebf6ab8448b1904773574a0d44e3a2c41 Mon Sep 17 00:00:00 2001 From: Shangxin Liu Date: Fri, 12 May 2017 16:10:58 -0400 Subject: [PATCH 2/2] fix the new comments of dynamic topography output --- tests/geoid/dynamic_topography.00000 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/geoid/dynamic_topography.00000 b/tests/geoid/dynamic_topography.00000 index 04fd3b298d3..7a11fdacba3 100644 --- a/tests/geoid/dynamic_topography.00000 +++ b/tests/geoid/dynamic_topography.00000 @@ -1,4 +1,4 @@ -# x y z topography +# x y z upper surface topography -69800.1 -387485 0 3009.6 -139125 -361885 66096.8 3987.36 -139125 -361885 -66096.8 3987.24