Changeset 14588
- Timestamp:
- 04/15/13 15:39:11 (12 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 7 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/Makefile.am
r14562 r14588 491 491 #}}} 492 492 #Gia sources {{{ 493 gia_sources = ./solutions/gia_core.cpp 493 gia_sources = ./solutions/gia_core.cpp\ 494 ./modules/ModelProcessorx/Gia/UpdateElementsGia.cpp\ 495 ./modules/ModelProcessorx/Gia/CreateNodesGia.cpp \ 496 ./modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp\ 497 ./modules/ModelProcessorx/Gia/CreateLoadsGia.cpp 498 494 499 #}}} 495 500 #Groundingline sources {{{ -
issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp
r14555 r14588 1734 1734 case BalancethicknessAnalysisEnum: 1735 1735 InputUpdateFromSolutionOneDof(solution,ThicknessEnum); 1736 break; 1737 #endif 1738 #ifdef _HAVE_GIA_ 1739 case GiaAnalysisEnum: 1740 InputUpdateFromSolutionOneDof(solution,GiaWEnum); 1736 1741 break; 1737 1742 #endif -
issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp
r13622 r14588 96 96 #endif 97 97 98 #ifdef _HAVE_GIA_ 99 case GiaAnalysisEnum: 100 CreateNodesGia(pnodes, iomodel); 101 CreateConstraintsGia(pconstraints,iomodel); 102 CreateLoadsGia(ploads,iomodel); 103 UpdateElementsGia(elements,iomodel,analysis_counter,analysis_type); 104 break; 105 #endif 106 98 107 #ifdef _HAVE_SLOPE_ 99 108 case BedSlopeAnalysisEnum: -
issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp
r13787 r14588 89 89 numdofs=1; 90 90 } 91 else if (analysis_type==GiaAnalysisEnum){ 92 numdofs=1; 93 } 91 94 else if (analysis_type==BalancethicknessAnalysisEnum){ 92 95 numdofs=1; -
issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h
r14562 r14588 46 46 void CreateLoadsDiagnosticHutter(Loads** ploads, IoModel* iomodel); 47 47 void UpdateElementsDiagnosticHutter(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); 48 49 #ifdef _HAVE_GIA_ 50 /*gia*/ 51 void CreateNodesGia(Nodes** pnodes,IoModel* iomodel); 52 void CreateConstraintsGia(Constraints** pconstraints,IoModel* iomodel); 53 void CreateLoadsGia(Loads** ploads, IoModel* iomodel); 54 void UpdateElementsGia(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); 55 #endif 48 56 49 57 /*bed slope*/ -
issm/trunk-jpl/src/c/solutions/gia_core.cpp
r14545 r14588 12 12 13 13 void gia_core(FemModel* femmodel){ 14 15 Vector<IssmDouble>* wg = NULL; 14 16 15 17 /*parameters: */ 16 18 bool save_results; 19 int gsize; 20 int configuration_type; 17 21 18 22 /*Recover some parameters: */ 19 23 femmodel->parameters->FindParam(&save_results,SaveResultsEnum); 20 24 femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); 25 21 26 if(VerboseSolution()) _pprintLine_(" computing GIA"); 22 27 23 28 /*Call on core computations: */ 24 29 femmodel->SetCurrentConfiguration(GiaAnalysisEnum); 25 solver_linear(femmodel); 30 31 /*Figure out size of g-set deflection vector and allocate solution vector: */ 32 gsize = femmodel->nodes->NumberOfDofs(configuration_type,GsetEnum); 33 wg = new Vector<IssmDouble>(gsize); 34 35 /*call the main module: */ 36 //Deflection(); 37 38 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,wg); 26 39 27 40 if(save_results){ -
issm/trunk-jpl/test/NightlyRun/test330.m
r14538 r14588 4 4 md=parameterize(md,'../Par/SquareShelfConstrained.par'); 5 5 md=setflowequation(md,'macayeal','all'); 6 md.verbose=verbose('solution',true,'convergence',true,'mprocessor',true );7 md.cluster=generic('name',oshostname(),'np', 3);6 md.verbose=verbose('solution',true,'convergence',true,'mprocessor',true,'module',true); 7 md.cluster=generic('name',oshostname(),'np',1); 8 8 md=solve(md,GiaSolutionEnum()); 9 9 10 10 %Fields and tolerances to track changes 11 field_names ={' W'};11 field_names ={'GiaW'}; 12 12 field_tolerances={1e-13}; 13 13 field_values={... 14 (md.results. DiagnosticSolution.W)};14 (md.results.GiaSolution.GiaW)};
Note:
See TracChangeset
for help on using the changeset viewer.