Changeset 9010

Timestamp:

07/15/11 18:45:38 (14 years ago)

Author:

Eric.Larour

Message:

Added max_its threshhold for iterations in steadystate_core.
Starting to add RheologyBbarx response in Dakota, to compute vertically
integrated B as a response.

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• modules/DakotaResponsesx/DakotaResponsesx.cpp (modified) (1 diff)
• modules/GroundingLineMigrationx/GroundingLineMigrationx.cpp (modified) (1 diff)
• modules/Responsex/Responsex.cpp (modified) (1 diff)
• modules/RheologyBbarx (added)
• modules/RheologyBbarx/RheologyBbarx.cpp (added)
• modules/RheologyBbarx/RheologyBbarx.h (added)
• modules/modules.h (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (2 diffs)
• solutions/steadystate_core.cpp (modified) (3 diffs)

issm/trunk/src/c/Makefile.am

@@ -695 +695 @@
                                         ./modules/ThicknessAbsGradientx/ThicknessAbsGradientx.h\
                                         ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\
-                                        ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h
+                                        ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\
+                                        ./modules/RheologyBbarx/RheologyBbarx.cpp\
+                                        ./modules/RheologyBbarx/RheologyBbarx.h
 
 
@@ -1366 +1368 @@
                                         ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\
                                         ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\
+                                        ./modules/RheologyBbarx/RheologyBbarx.cpp\
+                                        ./modules/RheologyBbarx/RheologyBbarx.h\
                                         ./solutions/diagnostic_core.cpp\
                                         ./solutions/convergence.cpp\

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

@@ -74 +74 @@
                         /*indexed response: plug index into parameters and call response module: */
                         parameters->SetParam(index,IndexEnum);
-                        
+
                         //Responsex(responses_pointer,elements,nodes, vertices,loads,materials, parameters,root,process_units);
                         Responsex(&femmodel_response,elements,nodes, vertices,loads,materials, parameters,root,process_units,0);//0 is the index for weights

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

@@ -21 +21 @@
         /*retrieve parameters: */
         parameters->FindParam(&migration_style,GroundingLineMigrationEnum);
-        
+
         /*call different migration modules, according to user wishes: */
         if(migration_style==AgressiveMigrationEnum) AgressiveMigration(elements,nodes, vertices,loads,materials, parameters);

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

@@ -41 +41 @@
                 case RheologyBbarAbsGradientEnum:RheologyBbarAbsGradientx( responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
                 case DragCoefficientAbsGradientEnum:DragCoefficientAbsGradientx(responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
+                case RheologyBbarEnum:RheologyBbarx(responses, elements,nodes, vertices, loads, materials, parameters,process_units); break;
                 default: _error_(" response descriptor \"%s\" not supported yet!",response_descriptor); break;
         }

issm/trunk/src/c/modules/modules.h

@@ -92 +92 @@
 #include "./Reducevectorgtofx/Reducevectorgtofx.h"
 #include "./Responsex/Responsex.h"
+#include "./RheologyBbarx/RheologyBbarx.h"
 #include "./RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h"
 #include "./Scotchx/Scotchx.h"

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -4754 +4754 @@
         if(!this->IsOnShelf() && elementonshelf==true)swap=1;
     this->inputs->AddInput(new BoolInput(ElementOnIceShelfEnum,elementonshelf));
-            
-        /*If this element just  became ungrounded, set its basal melting rate at 50 m/yr:*/
+        
+    /*If this element just  became ungrounded, set its basal melting rate at 50 m/yr:*/
         if(swap){
                 Input* basal_melting_rate_input     =inputs->GetInput(BasalMeltingRateEnum);     _assert_(basal_melting_rate_input);
@@ -4789 +4789 @@
         rho_ice=matpar->GetRhoIce();
         density=rho_ice/rho_water;
-
+        
         /*go through vertices, and update inputs, considering them to be TriaVertex type: */
         for(i=0;i<3;i++){

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

@@ -20 +20 @@
         int dim;
         int solution_type;
+        int max_its;
         bool control_analysis;
         
@@ -26 +27 @@
         femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        femmodel->parameters->FindParam(&max_its,MaxNonlinearIterationsEnum);
 
         /*intialize counters: */
@@ -41 +43 @@
                         _printf_(VerboseSolution(),"%s\n","   checking velocity, temperature and pressure convergence");
                         if(steadystateconvergence(femmodel)) break;
+                }
+                if(step>max_its){
+                        _printf_(VerboseSolution(),"%s%i%s\n","   maximum number of iterations ",max_its," reached");
+                        break;
                 }