Changeset 11240

Timestamp:

01/27/12 08:47:31 (13 years ago)

Author:

Mathieu Morlighem

Message:

fixed some merge conflicts between trunk and trunk-jpl

Location:

issm/trunk

Files:

• NEWS (modified) (1 diff)
• README (modified) (1 diff)
• doc/issmdoc.m (modified) (1 diff)
• src/c/objects/Vertex.cpp (modified) (1 diff)
• src/m/classes/inversion.m (modified) (1 diff)

issm/trunk/NEWS

@@ -1 @@
-
 please go to the ISSM website for the latest news:
 

issm/trunk/README

@@ -9 +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@jpl.nasa.gov

issm/trunk/doc/issmdoc.m

@@ -6 +6 @@
 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)'));

issm/trunk/src/c/objects/Vertex.cpp

@@ -71 +71 @@
         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);

issm/trunk/src/m/classes/inversion.m

@@ -108 +108 @@
                         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');