[issm-svn] r11240 - in issm/trunk: . doc src/c/objects src/m/classes

[morlighe at issm.ess.uci.edu]

Author: morlighe
Date: 2012-01-27 08:47:31 -0800 (Fri, 27 Jan 2012)
New Revision: 11240

Modified:
   issm/trunk/NEWS
   issm/trunk/README
   issm/trunk/doc/issmdoc.m
   issm/trunk/src/c/objects/Vertex.cpp
   issm/trunk/src/m/classes/inversion.m
Log:
fixed some merge conflicts between trunk and trunk-jpl

Modified: issm/trunk/NEWS
===================================================================
--- issm/trunk/NEWS	2012-01-27 16:41:40 UTC (rev 11239)
+++ issm/trunk/NEWS	2012-01-27 16:47:31 UTC (rev 11240)
@@ -1,4 +1,3 @@
-
 please go to the ISSM website for the latest news:
 
 http://issm.jpl.nasa.gov/

Modified: issm/trunk/README
===================================================================
--- issm/trunk/README	2012-01-27 16:41:40 UTC (rev 11239)
+++ issm/trunk/README	2012-01-27 16:47:31 UTC (rev 11240)
@@ -8,9 +8,9 @@
 
 Jet Propulsion Laboratory
 
-Eric          Eric Larour (Project Lead)
-Mathieu       Mathieu Morlighem (Anisotropic Meshing, Control Methods)
-Helene        Helene Seroussi (Coupling 2D-3D, Multi-model, full-Stokes)
+Eric    Larour (Project Lead)
+Mathieu Morlighem (Anisotropic Meshing, Control Methods)
+Helene  Seroussi (Coupling 2D-3D, Multi-model, full-Stokes)
 
 Email: issm at jpl.nasa.gov
 

Modified: issm/trunk/doc/issmdoc.m
===================================================================
--- issm/trunk/doc/issmdoc.m	2012-01-27 16:41:40 UTC (rev 11239)
+++ issm/trunk/doc/issmdoc.m	2012-01-27 16:47:31 UTC (rev 11240)
@@ -5,11 +5,11 @@
 
 disp(sprintf('\n%s','  A comprehensive documentation is available on http://issm.jpl.nasa.gov'));
 disp(sprintf('\n%s','  Example: how to create a square ice shelf'));
-disp(sprintf('%s','	   go to ',ISSM_TIER,'/examples/SquareIceshelf'));
-disp(sprintf('%s','	   md=model;                                %creates a new empty model structure'));
-disp(sprintf('%s','	   md=triangle(md,''DomainOutline.exp'',50000);   %creates a mesh of the domain outline with a resolution of 50000m'));
-disp(sprintf('%s','	   md=geography(md,''all'','''');               %defines the glacier system as an ice shelf (no island)'));
-disp(sprintf('%s','	   md=parameterize(md,''Square.par'');        %fills all the other fields of the model'));
-disp(sprintf('%s','	   md=setelementstype(md,''macayeal'',''all''); %defines all elements as MacAyeal''s'));
-disp(sprintf('%s','	   md=solve(md,DiagnosticSolutionEnum);   %generate the velocity field'));
-disp(sprintf('%s','	   plotmodel(md,''data'',md.results.DiagnosticSolution.Vel);    %displays the velocity (type plotdoc for plotmodel help)'));
+disp(sprintf(['  go to ' ISSM_TIER '/examples/SquareIceshelf\n']));
+disp(sprintf('%-58s %s','   md=model;','%creates a new empty model structure'));
+disp(sprintf('%-58s %s','   md=triangle(md,''DomainOutline.exp'',50000);','%creates a mesh of the domain outline with a resolution of 50000m'));
+disp(sprintf('%-58s %s','   md=setmask(md,''all'','''');','%defines the glacier system as an ice shelf (no island)'));
+disp(sprintf('%-58s %s','   md=parameterize(md,''Square.par'');','%fills all the other fields of the model'));
+disp(sprintf('%-58s %s','   md=setflowequation(md,''macayeal'',''all'');','%defines all elements as MacAyeal''s'));
+disp(sprintf('%-58s %s','   md=solve(md,DiagnosticSolutionEnum);','%generate the velocity field of the ice shelf'));
+disp(sprintf('%-58s %s','   plotmodel(md,''data'',md.results.DiagnosticSolution.Vel);','%displays the velocity (type plotdoc for plotmodel help)'));

Modified: issm/trunk/src/c/objects/Vertex.cpp
===================================================================
--- issm/trunk/src/c/objects/Vertex.cpp	2012-01-27 16:41:40 UTC (rev 11239)
+++ issm/trunk/src/c/objects/Vertex.cpp	2012-01-27 16:47:31 UTC (rev 11240)
@@ -70,7 +70,7 @@
 	printf("   y: %g\n",y);
 	printf("   z: %g\n",z);
 	printf("   sigma: %g\n",sigma);
-	printf("   connectivity: %g\n",connectivity);
+	printf("   connectivity: %i\n",connectivity);
 	printf("   dof: %i\n",dof);
 	printf("   clone: %i\n",clone);
 

Modified: issm/trunk/src/m/classes/inversion.m
===================================================================
--- issm/trunk/src/m/classes/inversion.m	2012-01-27 16:41:40 UTC (rev 11239)
+++ issm/trunk/src/m/classes/inversion.m	2012-01-27 16:47:31 UTC (rev 11240)
@@ -107,7 +107,7 @@
 			fielddisplay(obj,'iscontrol','is inversion activated?');
 			fielddisplay(obj,'control_parameters','parameter where inverse control is carried out; ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}');
 			fielddisplay(obj,'nsteps','number of optimization searches');
-			fielddisplay(obj,'cost_functions','indicate the type of response for each optimization steps');
+			fielddisplay(obj,'cost_functions','indicate the type of response for each optimization step');
 			fielddisplay(obj,'cost_functions_coefficients','cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter');
 			fielddisplay(obj,'cost_function_threshold','misfit convergence criterion. Default is 1%, NaN if not applied');
 			fielddisplay(obj,'maxiter_per_step','maximum iterations during each optimization step');