Changeset 22758 for issm/trunk/src/c/solutionsequences/solutionsequence_linear.cpp

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/solutionsequences/solutionsequence_linear.cpp (modified) (1 diff)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

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

@@ -35 +35 @@
         CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
         Reduceloadx(pf, Kfs, ys); delete Kfs;
+
+        femmodel->profiler->Start(SOLVER);
         Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); 
+        femmodel->profiler->Stop(SOLVER);
         
         /*Check that the solver converged nicely: */

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod