source: issm/oecreview/Archive/14312-15392/ISSM-15253-15254.diff@ 15393

Last change on this file since 15393 was 15393, checked in by Mathieu Morlighem, 12 years ago

NEW: adding Archive/14312-15392 for oecreview
File size: 1.2 KB
RevLine 
[15393]1Index: ../trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp
2===================================================================
3--- ../trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (revision 15253)
4+++ ../trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (revision 15254)
5@@ -42,9 +42,6 @@
6 femmodel->parameters->FindParam(&time,TimeEnum);
7 hydro_maxiter=100;
8 hydrocount=1;
9- sedconverged=false;
10- eplconverged=false;
11- hydroconverged=false;
12
13 /*Iteration on the two layers + transfer*/
14 femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);
15@@ -52,8 +49,9 @@
16 if(isefficientlayer) {
17 femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
18 GetSolutionFromInputsx(&ug_epl, femmodel->elements, femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters);
19-}
20+ }
21
22+ hydroconverged=false;
23 for(;;){
24 sedcount=1;
25 eplcount=1;
26@@ -72,6 +70,7 @@
27 femmodel->parameters->SetParam(HydrologySedimentEnum,HydrologyLayerEnum);
28
29 /*Iteration on the sediment layer*/
30+ sedconverged=false;
31 for(;;){
32 femmodel->HydrologyTransferx();
33 femmodel->SystemMatricesx(&Kff, &Kfs, &pf,&df, &sediment_kmax);
Note: See TracBrowser for help on using the repository browser.