Changeset 9010
- Timestamp:
- 07/15/11 18:45:38 (14 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 3 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Makefile.am
r9002 r9010 695 695 ./modules/ThicknessAbsGradientx/ThicknessAbsGradientx.h\ 696 696 ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\ 697 ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h 697 ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\ 698 ./modules/RheologyBbarx/RheologyBbarx.cpp\ 699 ./modules/RheologyBbarx/RheologyBbarx.h 698 700 699 701 … … 1366 1368 ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\ 1367 1369 ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\ 1370 ./modules/RheologyBbarx/RheologyBbarx.cpp\ 1371 ./modules/RheologyBbarx/RheologyBbarx.h\ 1368 1372 ./solutions/diagnostic_core.cpp\ 1369 1373 ./solutions/convergence.cpp\ -
issm/trunk/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp
r8607 r9010 74 74 /*indexed response: plug index into parameters and call response module: */ 75 75 parameters->SetParam(index,IndexEnum); 76 76 77 77 //Responsex(responses_pointer,elements,nodes, vertices,loads,materials, parameters,root,process_units); 78 78 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 21 21 /*retrieve parameters: */ 22 22 parameters->FindParam(&migration_style,GroundingLineMigrationEnum); 23 23 24 24 /*call different migration modules, according to user wishes: */ 25 25 if(migration_style==AgressiveMigrationEnum) AgressiveMigration(elements,nodes, vertices,loads,materials, parameters); -
issm/trunk/src/c/modules/Responsex/Responsex.cpp
r8608 r9010 41 41 case RheologyBbarAbsGradientEnum:RheologyBbarAbsGradientx( responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break; 42 42 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; 43 44 default: _error_(" response descriptor \"%s\" not supported yet!",response_descriptor); break; 44 45 } -
issm/trunk/src/c/modules/modules.h
r9002 r9010 92 92 #include "./Reducevectorgtofx/Reducevectorgtofx.h" 93 93 #include "./Responsex/Responsex.h" 94 #include "./RheologyBbarx/RheologyBbarx.h" 94 95 #include "./RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h" 95 96 #include "./Scotchx/Scotchx.h" -
issm/trunk/src/c/objects/Elements/Tria.cpp
r8998 r9010 4754 4754 if(!this->IsOnShelf() && elementonshelf==true)swap=1; 4755 4755 this->inputs->AddInput(new BoolInput(ElementOnIceShelfEnum,elementonshelf)); 4756 4757 4756 4757 /*If this element just became ungrounded, set its basal melting rate at 50 m/yr:*/ 4758 4758 if(swap){ 4759 4759 Input* basal_melting_rate_input =inputs->GetInput(BasalMeltingRateEnum); _assert_(basal_melting_rate_input); … … 4789 4789 rho_ice=matpar->GetRhoIce(); 4790 4790 density=rho_ice/rho_water; 4791 4791 4792 4792 /*go through vertices, and update inputs, considering them to be TriaVertex type: */ 4793 4793 for(i=0;i<3;i++){ -
issm/trunk/src/c/solutions/steadystate_core.cpp
r8392 r9010 20 20 int dim; 21 21 int solution_type; 22 int max_its; 22 23 bool control_analysis; 23 24 … … 26 27 femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum); 27 28 femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); 29 femmodel->parameters->FindParam(&max_its,MaxNonlinearIterationsEnum); 28 30 29 31 /*intialize counters: */ … … 41 43 _printf_(VerboseSolution(),"%s\n"," checking velocity, temperature and pressure convergence"); 42 44 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; 43 49 } 44 50
Note:
See TracChangeset
for help on using the changeset viewer.