Changeset 3485 for issm/trunk

Timestamp:

04/09/10 08:30:10 (15 years ago)

Author:

seroussi

Message:

bad usage of FieldExtrude

Location:

issm/trunk/src/m/solutions/jpl

Files:

• ControlInitialization.m (modified) (2 diffs)
• diagnostic_core.m (modified) (3 diffs)
• diagnostic_core_linear.m (modified) (1 diff)
• gradjcompute_core.m (modified) (1 diff)
• prognostic_core.m (modified) (1 diff)
• slopecompute_core.m (modified) (1 diff)

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

@@ -27 +27 @@
 slopex=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),BedXAnalysisEnum());
 slopey=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),BedYAnalysisEnum());
-slopex=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,m_sl.parameters,slopex,'slopex',0);
-slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,m_sl.parameters,slopey,'slopey',0);
+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);
 
 %Add to inputs
@@ -40 +40 @@
 u_g=diagnostic_core_nonlinear(m_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
 displaystring(verbose,'\n%s',['extruding horizontal velocities...']);
-u_g_horiz=FieldExtrude(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters,u_g,'velocity',1);
+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);
 
 %vertical velocities

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

@@ -31 +31 @@
         if dim==3,
                 displaystring(verbose,'\n%s',['extruding slopes in 3d...']);
-                slopex=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,m_sl.parameters,slopex,'slopex',0);
-                slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,m_sl.parameters,slopey,'slopey',0);
+                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);
         end
 
@@ -65 +65 @@
 
         displaystring(verbose,'\n%s',['extruding horizontal velocities...']);
-        u_g_horiz=FieldExtrude(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters,u_g,'velocity',1);
+        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);
 
         displaystring(verbose,'\n%s',['computing vertical velocities...']);
@@ -87 +87 @@
                 slopex=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),BedXAnalysisEnum());
                 slopey=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),BedYAnalysisEnum());
-                slopex=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,m_sl.parameters,slopex,'slopex',0);
-                slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,m_sl.parameters,slopey,'slopey',0);
+                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);
 
                 inputs=add(inputs,'bedslopex',slopex,'doublevec',m_sl.parameters.numberofdofspernode,m_sl.parameters.numberofnodes);

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

@@ -8 +8 @@
         m.parameters.kflag=1; m.parameters.pflag=1;
 
+        disp('file: diagnostic_core_linear.m  ok0');
+
         %Update inputs in datasets
         [m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters]=UpdateFromInputs(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs);
         
+        disp('file: diagnostic_core_linear.m  ok1');
+
         %system matrices
         [K_gg, p_g]=SystemMatrices(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
+        disp('file: diagnostic_core_linear.m  ok2');
+
         [K_gg, p_g,kmax]=PenaltySystemMatrices(K_gg,p_g,m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
+        disp('file: diagnostic_core_linear.m  ok3');
+
         
         %Reduce tangent matrix from g size to f size

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

@@ -39 +39 @@
 if (dim==3 & extrude_param),
         displaystring(verbose,'%s','          extruding gradient...');
-        grad_g=FieldExtrude(m.elements,m.nodes,m.loads,m.materials,m.parameters,grad_g,'gradj',0);
+        grad_g=FieldExtrude(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,grad_g,'gradj',0);
 end
 

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

@@ -20 +20 @@
 
         displaystring(m.parameters.verbose,'\n%s',['extrude computed thickness on all layers:']);
-        results.h_g=FieldExtrude(m.elements,m.nodes,m.loads,m.materials,m.parameters,results.h_g,'thickness',0);
+        results.h_g=FieldExtrude(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,results.h_g,'thickness',0);
 
 end %end function

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

@@ -15 +15 @@
 
         displaystring(m.parameters.verbose,'\n%s',['extrude computed slope on all layers:']);
-        results.sx_g=FieldExtrude(m.elements,m.nodes,m.loads,m.materials,m.parameters,results.sx_g,'slopex',0);
-        results.sy_g=FieldExtrude(m.elements,m.nodes,m.loads,m.materials,m.parameters,results.sy_g,'slopey',0);
+        results.sx_g=FieldExtrude(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,results.sx_g,'slopex',0);
+        results.sy_g=FieldExtrude(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,results.sy_g,'slopey',0);
 
 end %end function