Changeset 4446

Timestamp:

07/07/10 16:18:19 (15 years ago)

Author:

seroussi

Message:

some fixing in ResetBoundaryCondition

Location:

issm/trunk/src/m/solutions

Files:

• ResetBoundaryConditions.m (modified) (3 diffs)
• diagnostic_core.m (modified) (2 diffs)

issm/trunk/src/m/solutions/ResetBoundaryConditions.m

@@ -1 @@
-function femmodel=ResetBoundaryConditions(femmodel,analysis_type,sub_analysis_type);
+function femmodel=ResetBoundaryConditions(femmodel,analysis_type);
 %RESETBOUNDARYCONDITIONS - change boundary conditions of a model
 %
@@ -5 +5 @@
 %
 %   Usage:
-%      femmodel=ResetBoundaryConditions(femmodel,analysis_type,sub_analysis_type)
+%      femmodel=ResetBoundaryConditions(femmodel,analysis_type)
 
 
@@ -13 +13 @@
         displaystring(verbose,'\n%s',['updating boundary condition ...']);
 
-        ug=GetSolutionFromInputs(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-
         %set current analysis: 
         femmodel=SetCurrentConfiguration(femmodel,analysis_type);
+
+        ug=GetSolutionFromInputs(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
 
         %For this analysis_type, free existing boundary condition vectors:

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

@@ -38 +38 @@
                 femmodel=solver_linear(femmodel);
 
-                if(ismacayealpattyn)femmodel=ResetBoundaryConditions(femmodel,DiagnosticAnalysisEnum,HorizAnalysisEnum); end
+                if(ismacayealpattyn)femmodel=ResetBoundaryConditions(femmodel,DiagnosticHorizAnalysisEnum); end
 
         end
@@ -63 +63 @@
 
                         displaystring(verbose,'\n%s',['update boundary conditions for stokes using velocities previously computed...']);
-                        femmodel=ResetBoundaryConditions(femmodel,DiagnosticAnalysisEnum,StokesAnalysisEnum);
+                        femmodel=ResetBoundaryConditions(femmodel,DiagnosticStokesAnalysisEnum);
 
                         displaystring(verbose,'\n%s',['computing stokes velocities and pressure...']);