Changeset 3799

Timestamp:

05/18/10 10:18:11 (15 years ago)

Author:

seroussi

Message:

no inputs in diagnostic_core_nonlinear and linear

Location:

issm/trunk/src/m/solutions/jpl

Files:

• ControlInitialization.m (modified) (4 diffs)
• balancedthickness2_core.m (modified) (1 diff)
• balancedthickness_core.m (modified) (1 diff)
• balancedvelocities_core.m (modified) (1 diff)
• diagnostic_core_linear.m (modified) (1 diff)
• diagnostic_core_nonlinear.m (modified) (1 diff)
• gradjcompute_core.m (modified) (1 diff)
• objectivefunctionC.m (modified) (1 diff)
• prognostic2_core.m (modified) (1 diff)
• prognostic_core.m (modified) (1 diff)
• slopecompute_core.m (modified) (1 diff)
• thermal_core.m (modified) (2 diffs)
• transient3d.m (modified) (1 diff)

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

@@ -25 +25 @@
 %compute slopes
 displaystring(verbose,'\n%s',['computing bed slope (x and y derivatives)...']);
-slopex=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),BedXAnalysisEnum());
-slopey=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),BedYAnalysisEnum());
+slopex=diagnostic_core_linear(m_sl,SlopecomputeAnalysisEnum(),BedXAnalysisEnum());
+slopey=diagnostic_core_linear(m_sl,SlopecomputeAnalysisEnum(),BedYAnalysisEnum());
 slopex=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.vertices,m_sl.loads,m_sl.materials,m_sl.parameters,slopex,'slopex',0);
 slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.vertices,m_sl.loads,m_sl.materials,m_sl.parameters,slopey,'slopey',0);
@@ -38 +38 @@
 %horizontal velocities
 displaystring(verbose,'\n%s',['computing horizontal velocities...']);
-u_g=diagnostic_core_nonlinear(m_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+u_g=diagnostic_core_nonlinear(m_dh,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
 displaystring(verbose,'\n%s',['extruding horizontal velocities...']);
 u_g_horiz=FieldExtrude(m_dh.elements,m_dh.nodes,m_dh.vertices,m_dh.loads,m_dh.materials,m_dh.parameters,u_g,'velocity',1);
@@ -45 +45 @@
 displaystring(verbose,'\n%s',['computing vertical velocities...']);
 inputs=add(inputs,'velocity',u_g_horiz,'doublevec',m_dh.parameters.numberofdofspernode,m_dh.parameters.numberofnodes);
-u_g_vert=diagnostic_core_linear(m_dv,inputs,DiagnosticAnalysisEnum(),VertAnalysisEnum());
+u_g_vert=diagnostic_core_linear(m_dv,DiagnosticAnalysisEnum(),VertAnalysisEnum());
 
 %create 3d u_g
@@ -70 +70 @@
 %Compute Stokes velocities once to have a reasonably good ug in input
 displaystring(verbose,'\n%s',['computing stokes velocities and pressure ...']);
-u_g=diagnostic_core_nonlinear(m_ds,inputs,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
+u_g=diagnostic_core_nonlinear(m_ds,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
 inputs=add(inputs,'velocity',u_g,'doublevec',4,m_ds.parameters.numberofnodes);
 

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

@@ -23 +23 @@
 
         displaystring(m.parameters.Verbose,'\n%s',['call computational core:']);
-        results.h_g=diagnostic_core_linear(m,inputs,analysis_type,sub_analysis_type);
+        results.h_g=diagnostic_core_linear(m,analysis_type,sub_analysis_type);
 
         displaystring(m.parameters.Verbose,'\n%s',['averaging over vertices']);

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

@@ -17 +17 @@
 
         displaystring(m.parameters.Verbose,'\n%s',['call computational core:']);
-        results.h_g=diagnostic_core_linear(m,inputs,analysis_type,sub_analysis_type);
+        results.h_g=diagnostic_core_linear(m,analysis_type,sub_analysis_type);
 
         displaystring(m.parameters.Verbose,'\n%s',['extrude computed thickness on all layers:']);

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

@@ -17 +17 @@
 
         displaystring(m.parameters.Verbose,'\n%s',['call computational core:']);
-        results.h_g=diagnostic_core_linear(m,inputs,analysis_type,sub_analysis_type);
+        results.h_g=diagnostic_core_linear(m,analysis_type,sub_analysis_type);
 
         displaystring(m.parameters.Verbose,'\n%s',['extrude computed thickness on all layers:']);

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

@@ -3 +3 @@
 %
 %   Usage:
-%      u_g=diagnostic_core_linear(m,inputs,analysis_type,sub_analysis_type)
+%      u_g=diagnostic_core_linear(m,analysis_type,sub_analysis_type)
 
         %stiffness and load generation only:

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

@@ -3 +3 @@
 %
 %   Usage:
-%      [u_g varargout]=diagnostic_core_nonlinear(m,inputs,analysis_type,sub_analysis_type)
+%      [u_g varargout]=diagnostic_core_nonlinear(m,analysis_type,sub_analysis_type)
         
 %   first off! We are going to modify the loads dataset. We need to shield the loads from those changes once we return;

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

@@ -16 +16 @@
 %Recover solution for this stiffness and right hand side: 
 displaystring(verbose,'%s','         computing velocities...');
-[u_g K_ff0 K_fs0 ]=diagnostic_core_nonlinear(m,inputs,analysis_type,sub_analysis_type);
+[u_g K_ff0 K_fs0 ]=diagnostic_core_nonlinear(m,analysis_type,sub_analysis_type);
 inputs=add(inputs,'velocity',u_g,'doublevec',m.parameters.NumberOfDofsPerNode,m.parameters.NumberOfNodes);
 

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

@@ -17 +17 @@
 
 %Run diagnostic with updated parameters.
-u_g=diagnostic_core_nonlinear(m,inputs,analysis_type,sub_analysis_type);
+u_g=diagnostic_core_nonlinear(m,analysis_type,sub_analysis_type);
 
 %add velocity to inputs.

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

@@ -23 +23 @@
 
         displaystring(m.parameters.Verbose,'\n%s',['call computational core:']);
-        results.h_g=diagnostic_core_linear(m,inputs,analysis_type,sub_analysis_type);
+        results.h_g=diagnostic_core_linear(m,analysis_type,sub_analysis_type);
 
         displaystring(m.parameters.Verbose,'\n%s',['averaging over vertices']);

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

@@ -17 +17 @@
 
         displaystring(m.parameters.Verbose,'\n%s',['call computational core:']);
-        results.h_g=diagnostic_core_linear(m,inputs,analysis_type,sub_analysis_type);
+        results.h_g=diagnostic_core_linear(m,analysis_type,sub_analysis_type);
 
         displaystring(m.parameters.Verbose,'\n%s',['extrude computed thickness on all layers:']);

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

@@ -11 +11 @@
 
         displaystring(m.parameters.Verbose,'\n%s',['call computational core:']);
-        results.sx_g=diagnostic_core_linear(m,inputs,analysis_type,SurfaceXAnalysisEnum());
-        results.sy_g=diagnostic_core_linear(m,inputs,analysis_type,SurfaceYAnalysisEnum());
+        results.sx_g=diagnostic_core_linear(m,analysis_type,SurfaceXAnalysisEnum());
+        results.sy_g=diagnostic_core_linear(m,analysis_type,SurfaceYAnalysisEnum());
 
         displaystring(m.parameters.Verbose,'\n%s',['extrude computed slope on all layers:']);

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

@@ -20 +20 @@
         inputs=add(inputs,'melting_offset',melting_offset,'double');
         inputs=add(inputs,'temperature',results.t_g,'doublevec',1,m_t.parameters.NumberOfNodes);
-        results.m_g=diagnostic_core_linear(m_m,inputs,MeltingAnalysisEnum(),NoneAnalysisEnum());
+        results.m_g=diagnostic_core_linear(m_m,MeltingAnalysisEnum(),NoneAnalysisEnum());
 
 else
@@ -48 +48 @@
                 inputs=add(inputs,'temperature',results(n+1).t_g,'doublevec',1,m_t.parameters.NumberOfNodes);
                 inputs=add(inputs,'melting_offset',melting_offset,'double');
-                results(n+1).m_g=diagnostic_core_linear(m_m,inputs,MeltingAnalysisEnum(),NoneAnalysisEnum());
+                results(n+1).m_g=diagnostic_core_linear(m_m,MeltingAnalysisEnum(),NoneAnalysisEnum());
 
         end

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

@@ -89 +89 @@
         displaystring(md.verbose,'\n%s',['    computing melting...']);
         inputs=add(inputs,'melting_offset',melting_offset,'double');
-        results(n+1).m_g=diagnostic_core_linear(models.m,inputs,MeltingAnalysisEnum(),TransientAnalysisEnum());
+        results(n+1).m_g=diagnostic_core_linear(models.m,MeltingAnalysisEnum(),TransientAnalysisEnum());
 
         %Compute depth averaged temperature