Changeset 3853

Timestamp:

05/19/10 15:07:47 (15 years ago)

Author:

seroussi

Message:

some fixing in diagnostic_core

Location:

issm/trunk/src/m/solutions/jpl

Files:

• ModelUpdateInputsFromVector.m (modified) (1 diff)
• diagnostic_core.m (modified) (1 diff)

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

@@ -24 +24 @@
         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);
+        if isstruct(model), %there is an analysis_type model
+                [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);
+        end
 
 end

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

@@ -72 +72 @@
         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);
 
-        [vx,vy]=SplitSolutionVector(ug,numberofnodes,numberofdofspernode_dh);
+        [vx,vy]=SplitSolutionVector(u_g_horiz,m_dh.parameters.NumberOfNodes,m_dh.parameters.NumberOfDofsPerNode);
         ModelUpdateInputsFromVector(model,vx,VxEnum,VertexEnum);
         ModelUpdateInputsFromVector(model,vy,VyEnum,VertexEnum);