added iteration count for second version

This commit is contained in:
Jukka Aho
2015-06-15 00:08:22 +03:00
parent 35558ad0da
commit 409e9f04c2
+13 -20
View File
@@ -21,16 +21,18 @@
},
"outputs": [
{
"ename": "LoadError",
"evalue": "today not defined\nwhile loading In[1], in expression starting on line 1",
"output_type": "error",
"traceback": [
"today not defined\nwhile loading In[1], in expression starting on line 1",
""
]
"data": {
"text/plain": [
"2015-06-15"
]
},
"execution_count": 1,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"using Dates\n",
"today()"
]
},
@@ -216,7 +218,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"elapsed time: 12.592200168 seconds (2020893880 bytes allocated, 24.21% gc time)\n"
"elapsed time: 11.336512664 seconds (2020893880 bytes allocated, 26.15% gc time)\n"
]
}
],
@@ -301,7 +303,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Converged\n",
"Converged in 6 iterations\n",
"[0.0 -0.39914506095474317 -0.07228582695592449 0.0\n",
" 0.0 -2.1779892317073504 -2.222244754401764 0.0]\n"
]
@@ -321,7 +323,7 @@
" du = Kt[free_dofs, free_dofs] \\ -reshape(R, 8)[free_dofs]\n",
" u[free_dofs] += du\n",
" if norm(du) < 1.0e-9\n",
" println(\"Converged\")\n",
" println(\"Converged in \", i, \" iterations\")\n",
" break\n",
" end\n",
"end\n",
@@ -355,22 +357,13 @@
"name": "stdout",
"output_type": "stream",
"text": [
"elapsed time: 9.96484533 seconds (1554800080 bytes allocated, 27.40% gc time)\n"
"elapsed time: 8.447644445 seconds (1554800080 bytes allocated, 29.45% gc time)\n"
]
}
],
"source": [
"@time test_algo2()"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": []
}
],
"metadata": {