Changeset 5317

Timestamp:

08/17/10 13:40:58 (15 years ago)

Author:

Mathieu Morlighem

Message:

Only save results if control_analysis is false

Location:

issm/trunk/src/m/solutions

Files:

• adjoint_core.m (modified) (2 diffs)
• balancedthickness_core.m (modified) (2 diffs)
• balancedvelocities_core.m (modified) (2 diffs)
• bedslope_core.m (modified) (2 diffs)
• control_core.m (modified) (1 diff)
• diagnostic_core.m (modified) (2 diffs)
• prognostic_core.m (modified) (2 diffs)
• steadystate_core.m (modified) (2 diffs)
• surfaceslope_core.m (modified) (2 diffs)
• thermal_core.m (modified) (2 diffs)
• transient2d_core.m (modified) (2 diffs)
• transient3d_core.m (modified) (2 diffs)

issm/trunk/src/m/solutions/adjoint_core.m

@@ -9 +9 @@
         isstokes=femmodel.parameters.IsStokes;
         dim=femmodel.parameters.Dim;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
         conserve_loads=true;
@@ -34 +35 @@
         femmodel=solver_adjoint_linear(femmodel);
 
-        displaystring(verbose,'\n%s',['      saving results...']);
-        if(solution_type==AdjointSolutionEnum)
+        if(solution_type==AdjointSolutionEnum & ~control_analysis)
+                displaystring(verbose,'\n%s',['      saving results...']);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,AdjointxEnum);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,AdjointyEnum);

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

@@ -8 +8 @@
         verbose=femmodel.parameters.Verbose;
         dim=femmodel.parameters.Dim;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
 
@@ -16 +17 @@
         femmodel=solver_linear(femmodel);
 
-        if solution_type==BalancedthicknessSolutionEnum,
+        if (solution_type==BalancedthicknessSolutionEnum & ~control_analysis),
                 displaystring(verbose,'\n%s',['saving results...']);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ThicknessEnum);

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

@@ -8 +8 @@
         verbose=femmodel.parameters.Verbose;
         dim=femmodel.parameters.Dim;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
 
@@ -16 +17 @@
         femmodel=solver_linear(femmodel);
         
-        if solution_type==BalancedvelocitiesSolutionEnum,
+        if (solution_type==BalancedvelocitiesSolutionEnum & ~control_analysis),
                 displaystring(verbose,'\n%s',['saving results...']);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VelEnum);

issm/trunk/src/m/solutions/bedslope_core.m

@@ -9 +9 @@
         verbose=femmodel.parameters.Verbose;
         dim=femmodel.parameters.Dim;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
 
@@ -19 +20 @@
         femmodel=solver_linear(femmodel);
         
-        if solution_type==BedSlopeSolutionEnum,
+        if (solution_type==BedSlopeSolutionEnum & ~control_analysis),
                 displaystring(verbose,'\n%s',['saving results...']);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BedSlopeXEnum);

issm/trunk/src/m/solutions/control_core.m

@@ -72 +72 @@
         %generate output
         displaystring(verbose,'\n%s',['      preparing final velocity solution...']);
+        femmodel.parameters.ControlAnalysis=0;
         eval(['femmodel=' solutioncore '(femmodel);']);
 

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

@@ -18 +18 @@
         if(isstokes) stokesreconditioning=femmodel.parameters.StokesReconditioning; end
         qmu_analysis=femmodel.parameters.QmuAnalysis;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
 
@@ -71 +72 @@
         end
 
-        if solution_type==DiagnosticSolutionEnum,
+        if (solution_type==DiagnosticSolutionEnum & ~control_analysis)
                 displaystring(verbose,'\n%s',['saving results...']);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum);

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

@@ -7 +7 @@
         %recover parameters common to all solutions
         verbose=femmodel.parameters.Verbose;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
 
@@ -15 +16 @@
         femmodel=solver_linear(femmodel);
         
-        if solution_type==PrognosticSolutionEnum,
+        if (solution_type==PrognosticSolutionEnum & ~control_analysis)
                 displaystring(verbose,'\n%s',['saving results...']);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ThicknessEnum);

issm/trunk/src/m/solutions/steadystate_core.m

@@ -9 +9 @@
         verbose=femmodel.parameters.Verbose;
         dim=femmodel.parameters.Dim;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
 
@@ -38 +39 @@
         end
 
-        if solution_type==SteadystateSolutionEnum,
+        if (solution_type==SteadystateSolutionEnum & ~control_analysis),
                 displaystring(verbose,'\n%s',['saving results...']);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum);

issm/trunk/src/m/solutions/surfaceslope_core.m

@@ -9 +9 @@
         verbose=femmodel.parameters.Verbose;
         dim=femmodel.parameters.Dim;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
 
@@ -19 +20 @@
         femmodel=solver_linear(femmodel);
         
-        if solution_type==SurfaceSlopeSolutionEnum,
+        if (solution_type==SurfaceSlopeSolutionEnum),
                 displaystring(verbose,'\n%s',['saving results...']);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,SurfaceSlopeXEnum);

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

@@ -10 +10 @@
         ndt=femmodel.parameters.Ndt;
         dt=femmodel.parameters.Dt;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
 
@@ -28 +29 @@
                 femmodel=thermal_core_step(femmodel,i,time); 
 
-                if solution_type==ThermalSolutionEnum,
+                if (solution_type==ThermalSolutionEnum & ~control_analysis),
                         displaystring(verbose,'\n%s',['saving results...']);
                         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,i,time);

issm/trunk/src/m/solutions/transient2d_core.m

@@ -10 +10 @@
         dt=femmodel.parameters.Dt;
         yts=femmodel.parameters.Yts;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
         output_frequency=femmodel.parameters.OutputFrequency;
@@ -35 +36 @@
                 [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=UpdateGeometry(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
 
-                if (solution_type==Transient2DSolutionEnum & mod(step,output_frequency)==0),
+                if (solution_type==Transient2DSolutionEnum & ~control_analysis & mod(step,output_frequency)==0),
                         displaystring(verbose,'\n%s',['saving results...']);
                         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum,step,time);

issm/trunk/src/m/solutions/transient3d_core.m

@@ -10 +10 @@
         dt=femmodel.parameters.Dt;
         yts=femmodel.parameters.Yts;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         solution_type=femmodel.parameters.SolutionType;
         output_frequency=femmodel.parameters.OutputFrequency;
@@ -41 +42 @@
                 [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=UpdateVertexPositions(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
 
-                if (solution_type==Transient3DSolutionEnum & mod(step,output_frequency)==0),
+                if (solution_type==Transient3DSolutionEnum & ~control_analysis & mod(step,output_frequency)==0),
                         displaystring(verbose,'\n%s',['saving results...']);
                         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum,step,time);