Changeset 3793

Timestamp:

05/18/10 08:57:44 (15 years ago)

Author:

seroussi

Message:

names changed in matlab

Location:

issm/trunk/src/m/solutions/jpl

Files:

• ModelUpdateInputsFromVector.m (modified) (1 diff)
• diagnostic.m (modified) (1 diff)
• diagnostic_core.m (modified) (1 diff)
• slope_core.m (modified) (3 diffs)

issm/trunk/src/m/solutions/jpl/ModelUpdateInputsFromVector.m

@@ -1 +1 @@
 function ModelUpdateInputsFromVector(models, vector, enum, typeenum);
-%INPUT ModelUpdateInputsFromVector(models, vector, enum, typeenum);
+%MODELUPDATEINPUTSFROMVECTOR - Update inputs using a vector
 %
-% Update inputs using a vector, just calls the FemModelUpdateInputsFromVector routine for all models in the 'models' structure
+%   Update inputs using a vector, just calls the FemModelUpdateInputsFromVector 
+%   routine for all models in the 'models' structure
 % 
-% Usage: ModelUpdateInputsFromVector(models, vector, enum, typeenum);
+%   Usage: 
+%      ModelUpdateInputsFromVector(models, vector, enum, typeenum);
 %
-% ex:    ModelUpdateInputsFromVector(models, vx, VxEnum, VertexEnum);
-%        ModelUpdateInputsFromVector(models, vxelem, VxEnum, ElementEnum);
+%   Example:
+%      ModelUpdateInputsFromVector(models, vx, VxEnum, VertexEnum);
+%      ModelUpdateInputsFromVector(models, vxelem, VxEnum, ElementEnum);
 %
 %
-
 
 %go through models and call UpdateInputsFromVector
 modelfields=fields(models);
 for i=1:length(modelfields),
-        field=modelfields(i);field=field{1}; model=models.(field);
+        field=modelfields(i); field=field{1}; model=models.(field);
 
         [model.elements,model.nodes,model.vertices,model.loads,model.materials,model.parameters] = UpdateInputsFromVector(model.elements,model.nodes,model.vertices,model.loads,model.materials,model.parameters,vector,enum, typeenum);

issm/trunk/src/m/solutions/jpl/diagnostic.m

@@ -30 +30 @@
 
         %compute solution
-        if ~models.dh.parameters.qmu_analysis,
+        if ~models.dh.parameters.QmuAnalysis,
                 if md.control_analysis,
                         %launch core of control solution.

issm/trunk/src/m/solutions/jpl/diagnostic_core.m

@@ -14 +14 @@
 
 %recover parameters common to all solutions
-verbose=m_dhu.parameters.verbose;
-dim=m_dh.parameters.dim;
-ishutter=m_dhu.parameters.ishutter;
-ismacayealpattyn=m_dh.parameters.ismacayealpattyn;
-isstokes=m_ds.parameters.isstokes;
-numrifts=m_dhu.parameters.numrifts;
-qmu_analysis=m_dh.parameters.qmu_analysis;
+verbose=m_dhu.parameters.Verbose;
+dim=m_dh.parameters.Dim;
+ishutter=m_dhu.parameters.IsHutter;
+ismacayealpattyn=m_dh.parameters.IsMacAyealPattyn;
+isstokes=m_ds.parameters.IsStokes;
+numrifts=m_dhu.parameters.NumRifts;
+qmu_analysis=m_dh.parameters.QmuAnalysis;
 
         

issm/trunk/src/m/solutions/jpl/slope_core.m

@@ -1 +1 @@
 function [slopex, slopey]=slope_core(fem,AnalysisEnum)
-%INPUT [slopex, slopey]=slope_core(fem,AnalysisEnum)
+%SLOPE_CORE - Core solution to compute the slope
 %
-% Usage: [slopex, slopey]=slope_core(fem,AnalysisEnum)
+%    Usage: 
+%       [slopex, slopey]=slope_core(fem,AnalysisEnum)
 %
-% Ex: 
-%        [bedslopex, bedslopey]=slope_core(fem,BedEnum);
-%        [surfaceslopex, surfaceslopey]=slope_core(fem,SurfaceEnum);
+%    Examples: 
+%       [bedslopex, bedslopey]=slope_core(fem,BedEnum);
+%       [surfaceslopex, surfaceslopey]=slope_core(fem,SurfaceEnum);
 %
 
-
-verbose=m_dhu.parameters.verbose;
-dim=m_dh.parameters.dim;
-isstokes=m_ds.parameters.isstokes;
-ishutter=m_dhu.parameters.ishutter;
+verbose=fem.parameters.Verbose;
+dim=fem.parameters.Dim;
+isstokes=fem.parameters.IsStokes;
+ishutter=fem.parameters.IsHutter;
 
 displaystring(verbose,'\n%s',['computing slope (x and y derivatives...)']);
@@ -27 +27 @@
         displaystring(verbose,'%s%s%s','analysis ',EnumAsString(AnalysisEnum),' not supported yet!');
 end
-
 
 %Early return possible?
@@ -49 +48 @@
 slopey=diagnostic_core_linear(fem,SlopecomputeAnalysisEnum,yanalysis);
 
-
 %extrude if we are in 3D: 
 if dim==3,