Changeset 9010


Ignore:
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:
3 added
7 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/Makefile.am

    r9002 r9010  
    695695                                        ./modules/ThicknessAbsGradientx/ThicknessAbsGradientx.h\
    696696                                        ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\
    697                                         ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h
     697                                        ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\
     698                                        ./modules/RheologyBbarx/RheologyBbarx.cpp\
     699                                        ./modules/RheologyBbarx/RheologyBbarx.h
    698700
    699701
     
    13661368                                        ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\
    13671369                                        ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\
     1370                                        ./modules/RheologyBbarx/RheologyBbarx.cpp\
     1371                                        ./modules/RheologyBbarx/RheologyBbarx.h\
    13681372                                        ./solutions/diagnostic_core.cpp\
    13691373                                        ./solutions/convergence.cpp\
  • issm/trunk/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp

    r8607 r9010  
    7474                        /*indexed response: plug index into parameters and call response module: */
    7575                        parameters->SetParam(index,IndexEnum);
    76                        
     76
    7777                        //Responsex(responses_pointer,elements,nodes, vertices,loads,materials, parameters,root,process_units);
    7878                        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

    r8224 r9010  
    2121        /*retrieve parameters: */
    2222        parameters->FindParam(&migration_style,GroundingLineMigrationEnum);
    23        
     23
    2424        /*call different migration modules, according to user wishes: */
    2525        if(migration_style==AgressiveMigrationEnum) AgressiveMigration(elements,nodes, vertices,loads,materials, parameters);
  • issm/trunk/src/c/modules/Responsex/Responsex.cpp

    r8608 r9010  
    4141                case RheologyBbarAbsGradientEnum:RheologyBbarAbsGradientx( responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
    4242                case DragCoefficientAbsGradientEnum:DragCoefficientAbsGradientx(responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
     43                case RheologyBbarEnum:RheologyBbarx(responses, elements,nodes, vertices, loads, materials, parameters,process_units); break;
    4344                default: _error_(" response descriptor \"%s\" not supported yet!",response_descriptor); break;
    4445        }
  • issm/trunk/src/c/modules/modules.h

    r9002 r9010  
    9292#include "./Reducevectorgtofx/Reducevectorgtofx.h"
    9393#include "./Responsex/Responsex.h"
     94#include "./RheologyBbarx/RheologyBbarx.h"
    9495#include "./RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h"
    9596#include "./Scotchx/Scotchx.h"
  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r8998 r9010  
    47544754        if(!this->IsOnShelf() && elementonshelf==true)swap=1;
    47554755    this->inputs->AddInput(new BoolInput(ElementOnIceShelfEnum,elementonshelf));
    4756            
    4757         /*If this element just  became ungrounded, set its basal melting rate at 50 m/yr:*/
     4756       
     4757    /*If this element just  became ungrounded, set its basal melting rate at 50 m/yr:*/
    47584758        if(swap){
    47594759                Input* basal_melting_rate_input     =inputs->GetInput(BasalMeltingRateEnum);     _assert_(basal_melting_rate_input);
     
    47894789        rho_ice=matpar->GetRhoIce();
    47904790        density=rho_ice/rho_water;
    4791 
     4791       
    47924792        /*go through vertices, and update inputs, considering them to be TriaVertex type: */
    47934793        for(i=0;i<3;i++){
  • issm/trunk/src/c/solutions/steadystate_core.cpp

    r8392 r9010  
    2020        int dim;
    2121        int solution_type;
     22        int max_its;
    2223        bool control_analysis;
    2324       
     
    2627        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
    2728        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
     29        femmodel->parameters->FindParam(&max_its,MaxNonlinearIterationsEnum);
    2830
    2931        /*intialize counters: */
     
    4143                        _printf_(VerboseSolution(),"%s\n","   checking velocity, temperature and pressure convergence");
    4244                        if(steadystateconvergence(femmodel)) break;
     45                }
     46                if(step>max_its){
     47                        _printf_(VerboseSolution(),"%s%i%s\n","   maximum number of iterations ",max_its," reached");
     48                        break;
    4349                }
    4450               
Note: See TracChangeset for help on using the changeset viewer.