Changeset 9677

Timestamp:

09/07/11 16:23:24 (13 years ago)

Author:

seroussi

Message:

class steadystate

Location:

issm/trunk

Files:

• src/c/EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
• src/c/modules/EnumToStringx/EnumToStringx.cpp (modified) (2 diffs)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)
• src/c/solutions/steadystate_core.cpp (modified) (3 diffs)
• src/c/solutions/steadystateconvergence.cpp (modified) (1 diff)
• src/m/classes/model/model.m (modified) (5 diffs)
• src/m/classes/steadystate.m (added)
• src/m/enum/MaxSteadystateIterationsEnum.m (deleted)
• src/m/enum/SteadystateMaxiterEnum.m (added)
• src/m/enum/SteadystateReltolEnum.m (added)
• src/m/enum/SteadystateRequestedOutputsEnum.m (added)
• src/m/solutions/steadystateconvergence.m (modified) (1 diff)
• template (modified) (2 diffs)
• test/Par/79North.par (modified) (1 diff)
• test/Par/Pig.par (modified) (1 diff)
• test/Par/RoundSheetShelf.par (modified) (1 diff)
• test/Par/SquareSheetConstrained.par (modified) (1 diff)
• test/Par/SquareSheetShelf.par (modified) (1 diff)
• test/Par/SquareShelf.par (modified) (1 diff)
• test/Par/SquareShelfConstrained.par (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -91 +91 @@
         FlowequationBorderpattynEnum,
         FlowequationBordermacayealEnum,
+        SteadystateRequestedOutputsEnum,
+        SteadystateReltolEnum,
+        SteadystateMaxiterEnum,
         /*}}}*/
         /*Datasets {{{1*/
@@ -470 +473 @@
         NumberOfResponsesEnum,
 
-        MaxSteadystateIterationsEnum,
         RequestedOutputsEnum,
         NumRequestedOutputsEnum,

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -95 +95 @@
                 case FlowequationBorderpattynEnum : return "FlowequationBorderpattyn";
                 case FlowequationBordermacayealEnum : return "FlowequationBordermacayeal";
+                case SteadystateRequestedOutputsEnum : return "SteadystateRequestedOutputs";
+                case SteadystateReltolEnum : return "SteadystateReltol";
+                case SteadystateMaxiterEnum : return "SteadystateMaxiter";
                 case ConstraintsEnum : return "Constraints";
                 case ElementsEnum : return "Elements";
@@ -413 +416 @@
                 case WaitonlockEnum : return "Waitonlock";
                 case NumberOfResponsesEnum : return "NumberOfResponses";
-                case MaxSteadystateIterationsEnum : return "MaxSteadystateIterations";
                 case RequestedOutputsEnum : return "RequestedOutputs";
                 case NumRequestedOutputsEnum : return "NumRequestedOutputs";

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -34 +34 @@
         parameters->AddObject(iomodel->CopyConstantObject(EpsAbsEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MaxNonlinearIterationsEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(MaxSteadystateIterationsEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(SteadystateReltolEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(SteadystateMaxiterEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ConstantsYtsEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TimesteppingTimeStepEnum));

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -93 +93 @@
         else if (strcmp(name,"FlowequationBorderpattyn")==0) return FlowequationBorderpattynEnum;
         else if (strcmp(name,"FlowequationBordermacayeal")==0) return FlowequationBordermacayealEnum;
+        else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
+        else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
+        else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
         else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
         else if (strcmp(name,"Elements")==0) return ElementsEnum;
@@ -411 +414 @@
         else if (strcmp(name,"Waitonlock")==0) return WaitonlockEnum;
         else if (strcmp(name,"NumberOfResponses")==0) return NumberOfResponsesEnum;
-        else if (strcmp(name,"MaxSteadystateIterations")==0) return MaxSteadystateIterationsEnum;
         else if (strcmp(name,"RequestedOutputs")==0) return RequestedOutputsEnum;
         else if (strcmp(name,"NumRequestedOutputs")==0) return NumRequestedOutputsEnum;

issm/trunk/src/c/solutions/steadystate_core.cpp

@@ -20 +20 @@
         int dim;
         int solution_type;
-        int max_steadystate_iterations;
+        int maxiter;
         bool control_analysis;
         
@@ -27 +27 @@
         femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
-        femmodel->parameters->FindParam(&max_steadystate_iterations,MaxSteadystateIterationsEnum);
+        femmodel->parameters->FindParam(&maxiter,SteadystateMaxiterEnum);
 
         /*intialize counters: */
@@ -44 +44 @@
                         if(steadystateconvergence(femmodel)) break;
                 }
-                if(step>max_steadystate_iterations){
-                        _printf_(VerboseSolution(),"%s%i%s\n","   maximum number steadystate iterations ",max_steadystate_iterations," reached");
+                if(step>maxiter){
+                        _printf_(VerboseSolution(),"%s%i%s\n","   maximum number steadystate iterations ",maxiter," reached");
                         break;
                 }

issm/trunk/src/c/solutions/steadystateconvergence.cpp

@@ -31 +31 @@
 
         /*retrieve parameters: */
-        femmodel->parameters->FindParam(&convergencecriterionvalue[0],EpsRelEnum);
+        femmodel->parameters->FindParam(&convergencecriterionvalue[0],SteadystateReltolEnum);
         
         /*figure out convergence at the input level, because we don't have the solution vectors!: */

issm/trunk/src/m/classes/model/model.m

@@ -33 +33 @@
                  balancethickness = modelfield('default',0,'marshall',true);
                  flowequation = modelfield('default',0,'marshall',true);
+                 steadystate = modelfield('default',0,'marshall',true);
 
                  %FIXME: all other fields should belong to other classes
@@ -120 +121 @@
                  eps_abs                  = modelfield('default',0,'marshall',true,'format','Double');
                  max_nonlinear_iterations = modelfield('default',0,'marshall',true,'format','Integer');
-                 max_steadystate_iterations = modelfield('default',0,'marshall',true,'format','Integer');
                  connectivity             = modelfield('default',0,'marshall',true,'format','Integer');
                  viscosity_overshoot      = modelfield('default',0,'marshall',true,'format','Double');
@@ -379 +379 @@
                          if isfield(structmd,'elements_type'), md.flowequation.element_equation=structmd.elements_type; end
                          if isfield(structmd,'vertices_type'), md.flowequation.vertex_equation=structmd.vertices_type; end
+                         if isfield(structmd,'eps_rel'), md.flowequation.reltol=structmd.eps_rel; end
+                         if isfield(structmd,'max_steadystate_iterations'), md.flowequation.maxiter=structmd.max_steadystate_iterations; end
 
                          %Field changes
@@ -503 +505 @@
                          md.balancethickness=balancethickness;
                          md.flowequation=flowequation;
+                         md.steadystate=steadystate;
 
                          %Solver parameters
@@ -518 +521 @@
                          md.max_nonlinear_iterations=100;
                          
-                         %maximum of steady state iterations
-                         md.max_steadystate_iterations=100;
-
                          %the connectivity is the avergaded number of nodes linked to a
                          %given node through an edge. This connectivity is used to initially

issm/trunk/src/m/solutions/steadystateconvergence.m

@@ -10 +10 @@
 
         %Retrieve parameters
-        convergencecriterionvalue=femmodel.parameters.EpsRel;
+        convergencecriterionvalue=femmodel.parameters.SteadystateReltol;
         velocityenums=[VxEnum;VxPicardEnum;VyEnum;VyPicardEnum;VzEnum;VzPicardEnum;PressureEnum;PressurePicardEnum]; %pairs of enums (new and old) on which to carry out the converence tests
         temperatureenums=[TemperatureEnum;TemperatureOldEnum];

issm/trunk/template

@@ -51 +51 @@
           thickness_coeff -> rename hydrostatic_ratio (change ThicknessCorrection.m accordingly)
 }}}
-flowequation{{{
-        private: 
-                ishutter
-                ismacayealpattyn
-                isstokes
-
-                elements_type -> change to element_equation
-                vertices_type -> rename to vertex_equation
-                
-                elementonhutter ->delete
-                elementonmacayeal->delete
-                elementonpattyn->delete
-                elementonstokes->delete
-
-                nodeonhutter ->delete
-                nodeonmacayeal->delete
-                nodeonpattyn->delete
-                nodeonstokes->delete
-}}}
 initialization{{{
         vx
@@ -99 +80 @@
         penalty_lock -> rename rift_penalty_lock 
         min_mechanical_constraints -> rename  rift_penalty_threshold
-        requested_outputs
-}}}
-steadystate{{{
-        eps_rel -> rename following PETSc: reltol
-        max_steadystate_iterations -> rename maxiter
         requested_outputs
 }}}

issm/trunk/test/Par/79North.par

@@ -39 +39 @@
 md.eps_res=0.05;
 md.eps_rel=0.005;
+md.steadystate.reltol=0.005;
 md.eps_abs=NaN;
 

issm/trunk/test/Par/Pig.par

@@ -36 +36 @@
 md.eps_res=0.05;
 md.eps_rel=1;
+md.steadystate.reltol=1;
 md.eps_abs=NaN;
 

issm/trunk/test/Par/RoundSheetShelf.par

@@ -64 +64 @@
 md.eps_res=0.05;
 md.eps_rel=0.05;
+md.steadystate.reltol=0.05;
 md.eps_abs=NaN;
 md.timestepping.time_step=.1;

issm/trunk/test/Par/SquareSheetConstrained.par

@@ -37 +37 @@
 md.waitonlock=30;
 md.eps_res=0.05;
+md.steadystate.reltol=0.05;
 md.eps_rel=0.05;
 md.eps_abs=NaN;

issm/trunk/test/Par/SquareSheetShelf.par

@@ -44 +44 @@
 md.waitonlock=30;
 md.eps_res=0.05;
+md.steadystate.reltol=0.05;
 md.eps_rel=0.05;
 md.eps_abs=NaN;

issm/trunk/test/Par/SquareShelf.par

@@ -37 +37 @@
 md.verbose=verbose(0);
 md.eps_res=0.10;
+md.steadystate.reltol=0.02;
 md.eps_rel=0.02;
 md.eps_abs=NaN;

issm/trunk/test/Par/SquareShelfConstrained.par

@@ -42 +42 @@
 md.eps_res=0.05;
 md.eps_rel=0.05;
+md.steadystate.reltol=0.05;
 md.eps_abs=NaN;
 md.timestepping.time_step=1;