[cig-commits] [commit] master: (5d89a4b)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/hc

On branch  : master
Link       : https://github.com/geodynamics/hc/compare/6b700546c5208a149e128e202626235d6fe161da...66fedd8e2b64cc5088b67b0547c7167fe6463482

>---------------------------------------------------------------

commit 5d89a4bfb847af69335ce0de635c9ca39d998c69
Author: Thorsten Becker <twb at usc.edu>
Date:   Mon Oct 14 17:42:47 2013 +0000


>---------------------------------------------------------------

5d89a4bfb847af69335ce0de635c9ca39d998c69
 calc_dyn_topo     | 3 +++
 hc_invert_dtopo.c | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/calc_dyn_topo b/calc_dyn_topo
index b5a03ae..c778f98 100755
--- a/calc_dyn_topo
+++ b/calc_dyn_topo
@@ -36,3 +36,6 @@ cat tmp.ab | \
     gawk -v fac=$fac '{print($1,$2,$3*fac)}' | \
     xyz2grd -fg -Rg -I1 -Nnan  -Gdtopo.grd
 grd2map dtopo.grd
+
+
+hc_extract_sh_layer dscaled.sol.bin 2 4
\ No newline at end of file
diff --git a/hc_invert_dtopo.c b/hc_invert_dtopo.c
index ad2d5fa..f8889c9 100644
--- a/hc_invert_dtopo.c
+++ b/hc_invert_dtopo.c
@@ -88,16 +88,15 @@ int main(int argc, char **argv)
   {
     /* compute solution */
     hc_solve(model,p->free_slip,p->solution_mode,sol_spectral,
-	     (solved)?(FALSE):(TRUE), /* density changed? */
+	     TRUE, /* density changed? */
 	     (solved)?(FALSE):(TRUE), /* plate velocity changed? */
 	     TRUE,			/* viscosity changed */
 	     FALSE,p->compute_geoid,
 	     pvel,model->dens_anom,geoid,
 	     p->verbose);
     /* extract the top tractions */
-    hc_compute_dynamic_topography(model,sol_spectral,&dtopo,FALSE,p->verbose);
-    
-    sh_single_par_and_exp_to_file(dtopo,"dtopo.ab",TRUE,p->verbose);
+    hc_compute_dynamic_topography(model,sol_spectral,&dtopo,TRUE,p->verbose);
+    //sh_single_par_and_exp_to_file(dtopo,"dtopo.ab",TRUE,p->verbose);
 
     /* geoid correlation */
     hc_compute_correlation(geoid,p->ref_geoid,(gcorr),0,p->verbose); /* full correlation */