Changeset 3484

Timestamp:

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

Author:

Mathieu Morlighem

Message:

bug fix

Location:

issm/trunk/src

Files:

• m/solutions/jpl/ControlInitialization.m (modified) (1 diff)
• m/solutions/jpl/diagnostic_core.m (modified) (3 diffs)
• m/solutions/jpl/diagnostic_core_nonlinear.m (modified) (1 diff)
• m/solutions/jpl/thermal_core_nonlinear.m (modified) (1 diff)
• mex/ComputePressure/ComputePressure.cpp (modified) (1 diff)
• mex/PenaltyConstraints/PenaltyConstraints.cpp (modified) (1 diff)

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

@@ -55 +55 @@
 % get pressure (reconditionned) and create 4d u_g
 displaystring(verbose,'\n%s',['computing pressure according to Pattyn...']);
-p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
+p_g=ComputePressure(m_dh.elements,m_dh.nodes,mdh.vertices,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
 p_g=p_g/m_ds.parameters.stokesreconditioning;
 u_g_stokes=zeros(m_ds.nodesets.gsize,1);

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

@@ -43 +43 @@
 
         displaystring(verbose,'\n%s',['computing pressure according to MacAyeal...']);
-        p_g=ComputePressure(m_dhu.elements,m_dhu.nodes,m_dhu.loads,m_dhu.materials,m_dhu.parameters,inputs);
+        p_g=ComputePressure(m_dhu.elements,m_dhu.nodes,m_dhu.vertices,m_dhu.loads,m_dhu.materials,m_dhu.parameters,inputs);
 
         displaystring(verbose,'\n%s',['update boundary conditions for macyeal pattyn using hutter results...']);
@@ -59 +59 @@
 
         displaystring(verbose,'\n%s',['computing pressure according to MacAyeal...']);
-        p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
+        p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.vertices,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
 end
         
@@ -77 +77 @@
 
         displaystring(verbose,'\n%s',['computing pressure according to Pattyn...']);
-        p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
+        p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.vertices,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
         
         if isstokes,

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

@@ -58 +58 @@
                 
                 %penalty constraints
-                [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints( m.elements,m.nodes, loads, m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
+                [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints( m.elements,m.nodes,m.vertices,loads, m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
                 
                 displaystring(m.parameters.verbose,'%s%i','      number of unstable constraints: ',num_unstable_constraints);

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

@@ -61 +61 @@
                 %penalty constraints
                 displaystring(m.parameters.verbose,'%s',['   penalty constraints']);
-                [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints( m.elements,m.nodes, loads, m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
+                [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints(m.elements,m.nodes,m.vertices,loads, m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
         
                 if ~converged,

issm/trunk/src/mex/ComputePressure/ComputePressure.cpp

@@ -66 +66 @@
 void ComputePressureUsage(void) {
         printf("\n");
-        printf("   usage: [p_g] = %s(elements, nodes, loads, materials, params,inputs);\n",__FUNCT__);
+        printf("   usage: [p_g] = %s(elements, nodes, vertices, loads, materials, params,inputs);\n",__FUNCT__);
         printf("\n");
 }

issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp

@@ -72 +72 @@
 {
         _printf_("\n");
-        _printf_("   usage: [loads, constraints_converged, num_unstable_constraints] = %s(elements,nodes,loads,materials,params,inputs,analysis_type,sub_analysis_type);\n",__FUNCT__);
+        _printf_("   usage: [loads, constraints_converged, num_unstable_constraints] = %s(elements,nodes,vertices,loads,materials,params,inputs,analysis_type,sub_analysis_type);\n",__FUNCT__);
         _printf_("\n");
 }