Changeset 20500 for issm/trunk/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp (modified) (1 diff)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

issm/trunk/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp

@@ -102 +102 @@
                         }
                         if(converged==true){
-                                int step; IssmDouble time;
-                                femmodel->parameters->FindParam(&time,TimeEnum);
-                                femmodel->parameters->FindParam(&step,StepEnum);
-                                femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time));
                                 break;
                         }

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad