Changeset 3974

Timestamp:

05/27/10 14:34:13 (15 years ago)

Author:

seroussi

Message:

modified balanced thickness

Location:

issm/trunk/src/m/solutions/jpl

Files:

• balancedthickness.m (modified) (2 diffs)
• balancedthickness_core.m (modified) (1 diff)

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

@@ -17 +17 @@
         md.dof=modelsize(models);
 
-        %initialize inputs
-        displaystring(md.verbose,'\n%s',['setup inputs...']);
-        inputs=inputlist;
-        inputs=add(inputs,'velocity',models.bt.parameters.u_g,'doublevec',3,models.bt.parameters.NumberOfNodes);
-        inputs=add(inputs,'melting',models.bt.parameters.m_g,'doublevec',1,models.bt.parameters.NumberOfNodes);
-        inputs=add(inputs,'accumulation',models.bt.parameters.a_g,'doublevec',1,models.bt.parameters.NumberOfNodes);
-
+        %compute solution
         displaystring(md.verbose,'\n%s',['call computational core:']);
         results=balancedthickness_core(models,BalancedthicknessAnalysisEnum(),NoneAnalysisEnum());
@@ -29 +23 @@
         displaystring(md.verbose,'\n%s',['load results...']);
         if ~isstruct(md.results), md.results=struct(); end
-        md.results.BalancedThicknessAnalysis=processresults(models,results);
+        md.results.BalancedthicknessAnalysis=processresults(models,results);
 
         %stop timing

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

@@ -10 +10 @@
         results.step=1;
 
-        displaystring(m.parameters.Verbose,'\n%s',['depth averaging velocity...']);
-        %Take only the first two dofs of m.parameters.u_g
-        u_g=get(inputs,'velocity',[1 1 0 0]);
-        u_g=FieldDepthAverage(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,u_g,'velocity');
-        inputs=add(inputs,'velocity_average',u_g,'doublevec',2,m.parameters.NumberOfNodes);
-
         displaystring(m.parameters.Verbose,'\n%s',['call computational core:']);
         results.h_g=diagnostic_core_linear(m,analysis_type,sub_analysis_type);