diff --git a/examples/modules/csm/pages/ribs/disk.cfg b/examples/modules/csm/pages/ribs/disk.cfg index 7be72100..25ccbd02 100644 --- a/examples/modules/csm/pages/ribs/disk.cfg +++ b/examples/modules/csm/pages/ribs/disk.cfg @@ -1,9 +1,13 @@ fe-approximation=P2 #P1,P2 +directory=toolboxes/solid/ribs/disk2/P2 [solid] filename=$cfgdir/disk.json +mesh.filename=$cfgdir/disk2.msh +gmsh.partition=1 + on.type=elimination_symmetric # # precondtioner config @@ -11,11 +15,6 @@ pc-type=gamg #lu,gasm,ml ksp-monitor=1 # ksp-converged-reason=1 -mshfile=$cfgdir/disk1.msh -#[solid.gmsh] - [ts] steady=true -[exporter] -directory=applications/models/solid/disk1/$solid_tag diff --git a/examples/modules/csm/pages/ribs/disk.json b/examples/modules/csm/pages/ribs/disk.json index b4c09f9f..e37fab0d 100644 --- a/examples/modules/csm/pages/ribs/disk.json +++ b/examples/modules/csm/pages/ribs/disk.json @@ -1,12 +1,14 @@ { "Name": "Solid Mechanics ", "ShortName":"Solid", - "Model":"Elasticity", + "Models": + { + "equations":"Elasticity" + }, "Materials": { "omega": { - "name":"solid", "E":"210e3", // N/mm^2 "nu":"0.4", // "rho":"7800e-9" // kg/mm^3 @@ -34,18 +36,21 @@ }, "PostProcess": { - "Fields":["displacement","Von-Mises","tresca","principal-stresses"], + "Exports": + { + "fields":["displacement","Von-Mises","tresca","principal-stresses"] + }, "Measures": { - "VolumeVariation":"omega", - "Maximum": - { - "load": - { - "markers":"load", - "fields":["displacement","stress","normal-stress","wall-shear-stress"] - } - } + "VolumeVariation":"omega", + "Maximum": + { + "load": + { + "markers":"load", + "fields":["displacement"] + } + } } } diff --git a/examples/modules/csm/pages/ribs/index.adoc b/examples/modules/csm/pages/ribs/index.adoc index cf8428b3..ee0e6a39 100644 --- a/examples/modules/csm/pages/ribs/index.adoc +++ b/examples/modules/csm/pages/ribs/index.adoc @@ -1,11 +1,5 @@ = Bracing with ribs -Bereczki, Norbi -v1.0, 2018/01/13 -:toc: left -ifdef::env-github,env-browser[] -:outfilesuffix: .adoc -:imagesdir: https://media.githubusercontent.com/media/feelpp/toolbox/master/csm/ribs/ -endif::[] +:page-vtkjs: true == Introduction @@ -41,13 +35,48 @@ image:ribs/image3.png[Képernyőfelvétel (823).png,width=274,height=283]image:r Maximum displacement: 0.6501 mm Maximum stress: 512.4 MPa -image:ribs/image5.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Bordák_merevvé\d1.png,width=311,height=272]image:ribs/image6.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Bordák_merevvé\v1.png,width=309,height=272] +|==== +a| image:ribs/image5.png[] a| image:ribs/image6.png[] +|==== + +.3D Model without ribs. +++++ + +
+
+
+ + +++++ === With ribs Maximum displacement: 0.528 mm Maximum stress: 599.1 MPa -image:ribs/image7.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Bordák_merevvé\d2.png,width=304,height=272] image:ribs/image8.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Bordák_merevvé\v2.png,width=302,height=272] +|==== +a| image:ribs/image7.png[] a| image:ribs/image8.png[] +|==== + +.3D Model with ribs. +++++ + +
+
+
+ + +++++ + === Summary diff --git a/examples/modules/csm/pages/sensor/capteur.cfg b/examples/modules/csm/pages/sensor/capteur.cfg index f0ae70c7..ee75611d 100644 --- a/examples/modules/csm/pages/sensor/capteur.cfg +++ b/examples/modules/csm/pages/sensor/capteur.cfg @@ -1,14 +1,19 @@ -fe-approximation=P2 #P1,P2 +fe-approximation=P1 #P1,P2 +directory=toolboxes/solid/sensor/P1 [solid] filename=$cfgdir/capteur.json +mesh.filename=$cfgdir/capteur.msh +gmsh.partition=1 + material_law=StVenantKirchhoff# StVenantKirchhoff, NeoHookean # use density and material coeff cst in appli jacobian-linear-update=false linearsystem-cst-update=false +snes-monitor=1 # snes and ksp config #reuse-prec=true#false #reuse-jac=true#false @@ -20,21 +25,12 @@ snes-ksp-maxit=1000 snes-ksp-maxit-reuse=100 # precondtioner config -pc-type=lu #lu,gasm,ml +pc-type=gamg #lu,gasm,ml ksp-converged-reason=1 -mshfile=$cfgdir/capteur.msh -#[solid.gmsh] - [ts] time-step=0.05 time-final=0.63 #restart=true restart.at-last-save=true #save.freq=2 - - -[exporter] -directory=applications/models/capteur/$solid_tag -freq=1 -#format=ensightgold \ No newline at end of file diff --git a/examples/modules/csm/pages/sensor/capteur.json b/examples/modules/csm/pages/sensor/capteur.json index 6a2f6337..b5158ce8 100644 --- a/examples/modules/csm/pages/sensor/capteur.json +++ b/examples/modules/csm/pages/sensor/capteur.json @@ -1,12 +1,14 @@ { "Name": "Solid Mechanics ", "ShortName":"Solid", - "Model":"Hyper-Elasticity", + "Models": + { + "equations":"Hyper-Elasticity" + }, "Materials": { "omega": { - "name":"solid", "E":"205e3", "nu":"0.3", "rho":"7850e-9" @@ -16,7 +18,7 @@ { "displacement": { - "Dirichlet": + "Dirichlet": { "fixed": { @@ -29,7 +31,7 @@ { "expr":"{0,(100*sin(5*t)),0}:t" }, - "load2": + "load2": { "expr":"{0,(-100*sin(5*t)),0}:t" } @@ -39,18 +41,20 @@ }, "PostProcess": { - "Fields":["displacement","Von-Mises"], + "Exports": + { + "fields":["displacement","Von-Mises","pid"] + }, "Measures": { - "Maximum": - { - "Max": - { - "markers":"load", - "fields":["displacement"] - } - - } + "Maximum": + { + "Max": + { + "markers":"load", + "fields":["displacement"] + } + } } } diff --git a/examples/modules/csm/pages/sensor/images/media/image1.wmf b/examples/modules/csm/pages/sensor/images/media/image1.wmf deleted file mode 100644 index aa66704a..00000000 Binary files a/examples/modules/csm/pages/sensor/images/media/image1.wmf and /dev/null differ diff --git a/examples/modules/csm/pages/sensor/images/media/image10.png b/examples/modules/csm/pages/sensor/images/media/image10.png deleted file mode 100644 index da074d96..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image10.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d080817325c7564ca532f7f3d49217a3b650261f25b42ec82958a15fe2f3492 -size 205040 diff --git a/examples/modules/csm/pages/sensor/images/media/image11.png b/examples/modules/csm/pages/sensor/images/media/image11.png deleted file mode 100644 index 9b42b783..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image11.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47db2e1856b4c07bb9875b630bb964494ab471e6967a2af26d3a7dd8be8078f0 -size 210861 diff --git a/examples/modules/csm/pages/sensor/images/media/image12.png b/examples/modules/csm/pages/sensor/images/media/image12.png deleted file mode 100644 index 0c4ca674..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image12.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2b1ad9ab3b7c528a25ea21cf78eb726d14a2ae9c4fcb621d6d8dd79cb192c72 -size 214087 diff --git a/examples/modules/csm/pages/sensor/images/media/image13.png b/examples/modules/csm/pages/sensor/images/media/image13.png deleted file mode 100644 index ec17e111..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image13.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70bea9f1532a82c5d789d646c5a07ec036a621ff616aaa6ab3cfa877f47a2db9 -size 168991 diff --git a/examples/modules/csm/pages/sensor/images/media/image14.png b/examples/modules/csm/pages/sensor/images/media/image14.png deleted file mode 100644 index 9dee8417..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image14.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:875c1b49eb27b335133f3cab885de22a1797440cc4676ebcbb90cbf419ae3e0e -size 187361 diff --git a/examples/modules/csm/pages/sensor/images/media/image15.png b/examples/modules/csm/pages/sensor/images/media/image15.png deleted file mode 100644 index e198fe90..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image15.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dae2d242237379a3ed23f85d6ae2a9d3ebc107bb77f2939343655e5da145069 -size 197518 diff --git a/examples/modules/csm/pages/sensor/images/media/image16.png b/examples/modules/csm/pages/sensor/images/media/image16.png deleted file mode 100644 index 2485d84b..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image16.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42454d6f0efa12a84fd84d5863ec9c0a7eac6fa0b0eba08bc250c4da09b8231b -size 201135 diff --git a/examples/modules/csm/pages/sensor/images/media/image17.png b/examples/modules/csm/pages/sensor/images/media/image17.png deleted file mode 100644 index 9401396a..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image17.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8a7cddec4922ab0d88b1f074d9f95a4d155e9eeb55428b405cd105cf2701165 -size 202484 diff --git a/examples/modules/csm/pages/sensor/images/media/image2.png b/examples/modules/csm/pages/sensor/images/media/image2.png deleted file mode 100644 index 30008099..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:484a528bc77ef568914b4d84fa53e28bd37c18fb37691d68b749c0bb08071ee4 -size 14731 diff --git a/examples/modules/csm/pages/sensor/images/media/image3.png b/examples/modules/csm/pages/sensor/images/media/image3.png deleted file mode 100644 index 9969ec33..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6300a215171d2a2231b10d4c7ca2db3b8b84e7187ad26628783c097ea67e290e -size 26879 diff --git a/examples/modules/csm/pages/sensor/images/media/image4.png b/examples/modules/csm/pages/sensor/images/media/image4.png deleted file mode 100644 index 4a979e52..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68627faa5345950dbe4c0ac8777fa7ba82081ef44354b6f79dcd8f350e3a950f -size 28879 diff --git a/examples/modules/csm/pages/sensor/images/media/image5.png b/examples/modules/csm/pages/sensor/images/media/image5.png deleted file mode 100644 index 623a4403..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:652ecc6d3ad3b23a9ce7c738ccec6ad29e160c960b1d296deee4bc358fc3cdee -size 197537 diff --git a/examples/modules/csm/pages/sensor/images/media/image6.png b/examples/modules/csm/pages/sensor/images/media/image6.png deleted file mode 100644 index 69c12c06..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7cdb3210aed9f9e9716c9f9eeda9d9aa4d405fa9bfad647747de5455c74d822 -size 399477 diff --git a/examples/modules/csm/pages/sensor/images/media/image7.png b/examples/modules/csm/pages/sensor/images/media/image7.png deleted file mode 100644 index 9858598a..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image7.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d2a669ccbcfaafcc379e1b901def9fb4ae2d734ab8a49f098ad2e66d686d1f3 -size 33881 diff --git a/examples/modules/csm/pages/sensor/images/media/image8.png b/examples/modules/csm/pages/sensor/images/media/image8.png deleted file mode 100644 index 3413d01b..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image8.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb4918be95d0c084e3ebbf5fd314d62d174551a70bb217f582de9f181c0ff126 -size 173132 diff --git a/examples/modules/csm/pages/sensor/images/media/image9.png b/examples/modules/csm/pages/sensor/images/media/image9.png deleted file mode 100644 index c9ea62f6..00000000 --- a/examples/modules/csm/pages/sensor/images/media/image9.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7361b9558bfc3e6b0ddb4df2b1a3ae2fc5afe76aba31114fd55d9e876534d65f -size 193896 diff --git a/examples/modules/csm/pages/sensor/index.adoc b/examples/modules/csm/pages/sensor/index.adoc index db971fe6..2a67abc9 100644 --- a/examples/modules/csm/pages/sensor/index.adoc +++ b/examples/modules/csm/pages/sensor/index.adoc @@ -1,12 +1,5 @@ = Sensor -Bereczki, Norbi -v1.0, 2018/01/13 -:toc: left -:stem: latexmath -ifdef::env-github,env-browser[] -:outfilesuffix: .adoc -:imagesdir: https://media.githubusercontent.com/media/feelpp/toolbox/master/csm/sensor/ -endif::[] +:page-vtkjs: true == Introduction @@ -46,26 +39,32 @@ IMPORTANT: The result were run in time (half whole period, but on the pictures c === Displacement -image:sensor/image8.png[image] - -image:sensor/image9.png[image] - -image:sensor/image10.png[image] - -image:sensor/image11.png[image] - -image:sensor/image12.png[image] +|==== +a| image:sensor/image8.png[] a| image:sensor/image9.png[] a| image:sensor/image10.png[] +a| image:sensor/image11.png[] a| image:sensor/image12.png[] | +|==== === Von-Mises Criterions -image:sensor/image13.png[image] +|==== +a| image:sensor/image13.png[image] a| image:sensor/image14.png[image] a| image:sensor/image15.png[image] +a| image:sensor/image16.png[image] a| image:sensor/image17.png[image] | +|==== -image:sensor/image14.png[image] +On the displacement and stress diagrams, it can be clearly seen that this object is perfectly suited as a sensor. -image:sensor/image15.png[image] +=== 3D Model -image:sensor/image16.png[image] +++++ -image:sensor/image17.png[image] +
+
+
+ -On the displacement and stress diagrams, it can be clearly seen that this object is perfectly suited as a sensor. +++++ diff --git a/examples/modules/csm/pages/sheet-rounding/T9.cfg b/examples/modules/csm/pages/sheet-rounding/T9.cfg index 889a0be0..57812a2e 100644 --- a/examples/modules/csm/pages/sheet-rounding/T9.cfg +++ b/examples/modules/csm/pages/sheet-rounding/T9.cfg @@ -1,8 +1,12 @@ fe-approximation=P2 #P1,P2 +directory=toolboxes/solid/sheet-rounding/T9_3/P2 [solid] -filename=/home/student1/feel/T9/T9.json +filename=$cfgdir/T9.json + +mesh.filename=$cfgdir/T9_3.geo +gmsh.hsize=2 on.type=elimination_symmetric @@ -11,12 +15,5 @@ pc-type=gamg #lu,gasm,ml ksp-monitor=1 # ksp-converged-reason=1 -geofile=/home/student1/feel/T9/T9_3.geo -[solid.gmsh] -hsize=2 - [ts] steady=true - -[exporter] -directory=applications/models/T9/T9_v1/$solid_tag diff --git a/examples/modules/csm/pages/sheet-rounding/T9.json b/examples/modules/csm/pages/sheet-rounding/T9.json index 9d6a601c..222a9087 100644 --- a/examples/modules/csm/pages/sheet-rounding/T9.json +++ b/examples/modules/csm/pages/sheet-rounding/T9.json @@ -1,12 +1,14 @@ { "Name": "Solid Mechanics ", "ShortName":"Solid", - "Model":"Elasticity", + "Models": + { + "equations":"Elasticity" + }, "Materials": { "omega": { - "name":"solid", "E":"210e3", "nu":"0.3", "rho":"7870e-9" @@ -34,7 +36,10 @@ }, "PostProcess": { - "Fields":["displacement","Von-Mises","tresca","principal-stresses"], + "Exports": + { + "fields":["displacement","Von-Mises","tresca","principal-stresses"] + }, "Measures": { "Points": @@ -45,14 +50,14 @@ "fields":["stress_yy"] } }, - "Maximum": - { - "test": - { - "markers":"test", - "fields":["displacement","stress","normal-stress","wall-shear-stress"] - } - } + "Maximum": + { + "test": + { + "markers":"test", + "fields":["displacement"] + } + } } } diff --git a/examples/modules/csm/pages/sheet-rounding/images/media/image1.png b/examples/modules/csm/pages/sheet-rounding/images/media/image1.png deleted file mode 100644 index afebefd5..00000000 --- a/examples/modules/csm/pages/sheet-rounding/images/media/image1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:532ffac84e246ed6a77f0e23e4c1a01bdc85558672300e32e1fac57c5c87fffa -size 234651 diff --git a/examples/modules/csm/pages/sheet-rounding/images/media/image2.png b/examples/modules/csm/pages/sheet-rounding/images/media/image2.png deleted file mode 100644 index 124c1cdc..00000000 --- a/examples/modules/csm/pages/sheet-rounding/images/media/image2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3808a97cccc9647212fe415116b6de7eceacc6f36de40849a2d3ced9689352b -size 239904 diff --git a/examples/modules/csm/pages/sheet-rounding/images/media/image3.png b/examples/modules/csm/pages/sheet-rounding/images/media/image3.png deleted file mode 100644 index 8551d968..00000000 --- a/examples/modules/csm/pages/sheet-rounding/images/media/image3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08450a551dbe770a91e215cdfd2ddbc7e213c46a746a1e482f539d50d862d1ca -size 10138 diff --git a/examples/modules/csm/pages/sheet-rounding/images/media/image4.png b/examples/modules/csm/pages/sheet-rounding/images/media/image4.png deleted file mode 100644 index 9b537b9b..00000000 --- a/examples/modules/csm/pages/sheet-rounding/images/media/image4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:650b2f06360df6f6f81168788e860e581997c6fa3f3dfdbd32b48df532c93d9a -size 222254 diff --git a/examples/modules/csm/pages/sheet-rounding/images/media/image5.png b/examples/modules/csm/pages/sheet-rounding/images/media/image5.png deleted file mode 100644 index bc8e97a9..00000000 --- a/examples/modules/csm/pages/sheet-rounding/images/media/image5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f8d56d508aef60975ff5ec007482c1db8431c42ee6aed9a689f2261a89d4e79 -size 54695 diff --git a/examples/modules/csm/pages/sheet-rounding/images/media/image6.png b/examples/modules/csm/pages/sheet-rounding/images/media/image6.png deleted file mode 100644 index 4208e371..00000000 --- a/examples/modules/csm/pages/sheet-rounding/images/media/image6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d74f2fa650087de16cbdbe9c4984308e2d194e9ffed12a53d25a3c7a4c6ba249 -size 221226 diff --git a/examples/modules/csm/pages/sheet-rounding/images/media/image7.png b/examples/modules/csm/pages/sheet-rounding/images/media/image7.png deleted file mode 100644 index 42694d96..00000000 --- a/examples/modules/csm/pages/sheet-rounding/images/media/image7.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:975c4d9eb086843ee266e8418669cf052172c826958c8632fd15317a2fd50897 -size 61655 diff --git a/examples/modules/csm/pages/sheet-rounding/index.adoc b/examples/modules/csm/pages/sheet-rounding/index.adoc index c0d4da90..f5d18c42 100644 --- a/examples/modules/csm/pages/sheet-rounding/index.adoc +++ b/examples/modules/csm/pages/sheet-rounding/index.adoc @@ -1,12 +1,5 @@ = Effect of sheet rounding -Bereczki, Norbi -v1.0, 2018/01/13 -:toc: left -:stem: latexmath -ifdef::env-github,env-browser[] -:outfilesuffix: .adoc -:imagesdir: https://media.githubusercontent.com/media/feelpp/toolbox/master/csm/sheet-rounding/ -endif::[] +:page-vtkjs: true == Introduction @@ -42,8 +35,10 @@ The beam is made of steel, so we need to use the following data: The plate is fixed with two bolts (where would be contact between the plate and bolts named `fixed`). The force is applied, where the other two bolts press down the plate (named `load`). -image:sheet-rounding/image2.png[width=286,height=279] -image:sheet-rounding/image3.png[width=205,height=279] +|==== +a| image:sheet-rounding/image2.png[] a| image:sheet-rounding/image3.png[] +|==== + == Results @@ -53,15 +48,45 @@ We provide Displacement and Von-Mises Criterions Maximum displacement: 9.629 mm Maximum stress: 11 890 MPa -image:sheet-rounding/image4.png[width=321,height=245] -image:sheet-rounding/image5.png[width=300,height=245] +|==== +a| image:sheet-rounding/image4.png[] a| image:sheet-rounding/image5.png[] +|==== + +++++ + +
+
+
+ + +++++ === Modified geometry (rounding) Maximum displacement: 7.852 mm Maximum stress: 7 047 MPa -image:sheet-rounding/image6.png[width=307,height=245] -image:sheet-rounding/image7.png[width=279,height=245] +|==== +a| image:sheet-rounding/image6.png[] a| image:sheet-rounding/image7.png[] +|==== + +++++ + +
+
+
+ + +++++ === Effects of rounding diff --git a/examples/modules/csm/pages/suspension/images/media/image1.jpeg b/examples/modules/csm/pages/suspension/images/media/image1.jpeg deleted file mode 100644 index ad726162..00000000 --- a/examples/modules/csm/pages/suspension/images/media/image1.jpeg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91835c999fa92bb5fec248505cdb106b2e094554e6e4366dca0d162dd410034a -size 11010 diff --git a/examples/modules/csm/pages/suspension/images/media/image10.png b/examples/modules/csm/pages/suspension/images/media/image10.png deleted file mode 100644 index 360f7c1b..00000000 --- a/examples/modules/csm/pages/suspension/images/media/image10.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f2723ed35a09429a74b095be4408d459c55b98f0c4648106efb4f809dd1db1f -size 179288 diff --git a/examples/modules/csm/pages/suspension/images/media/image11.png b/examples/modules/csm/pages/suspension/images/media/image11.png deleted file mode 100644 index 1b7cf77d..00000000 --- a/examples/modules/csm/pages/suspension/images/media/image11.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2395003cca74f853513741f9ec16a6816b099bc8299496e3798b7039409189c3 -size 182527 diff --git a/examples/modules/csm/pages/suspension/images/media/image2.jpeg b/examples/modules/csm/pages/suspension/images/media/image2.jpeg deleted file mode 100644 index 4190f2ef..00000000 --- a/examples/modules/csm/pages/suspension/images/media/image2.jpeg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d61b4774060437098c686e03c7aa62886a1939124369072128b09d62535d2a6 -size 100635 diff --git a/examples/modules/csm/pages/suspension/images/media/image3.png b/examples/modules/csm/pages/suspension/images/media/image3.png deleted file mode 100644 index dcb225b2..00000000 --- a/examples/modules/csm/pages/suspension/images/media/image3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0969d3f10368c65335d282cc1754301dbfa0fa84a4f44d0894b5744259988d4a -size 112898 diff --git a/examples/modules/csm/pages/suspension/images/media/image5.png b/examples/modules/csm/pages/suspension/images/media/image5.png deleted file mode 100644 index 16ec0a63..00000000 --- a/examples/modules/csm/pages/suspension/images/media/image5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6336ab798faa1b85440c118591cdb665692a2579a484a9e986e2e33e5de1d373 -size 365617 diff --git a/examples/modules/csm/pages/suspension/images/media/image6.png b/examples/modules/csm/pages/suspension/images/media/image6.png deleted file mode 100644 index b5f9770d..00000000 --- a/examples/modules/csm/pages/suspension/images/media/image6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d65f61a63066ba649a8101ff003d63fd326fbff3d9103d720f8606e341bf38b -size 10943 diff --git a/examples/modules/csm/pages/suspension/images/media/image7.png b/examples/modules/csm/pages/suspension/images/media/image7.png deleted file mode 100644 index d7647743..00000000 --- a/examples/modules/csm/pages/suspension/images/media/image7.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:321de4eb930c3b50a87430596529bf74228ddc4a07e49550e59fb9e65c237040 -size 159281 diff --git a/examples/modules/csm/pages/suspension/images/media/image8.png b/examples/modules/csm/pages/suspension/images/media/image8.png deleted file mode 100644 index 9d0664c1..00000000 --- a/examples/modules/csm/pages/suspension/images/media/image8.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cabe5181702547b45e588c22cab8a6178191359a63d51d297f7adb981da60a61 -size 153476 diff --git a/examples/modules/csm/pages/suspension/images/media/image9.png b/examples/modules/csm/pages/suspension/images/media/image9.png deleted file mode 100644 index 0bf15d71..00000000 --- a/examples/modules/csm/pages/suspension/images/media/image9.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96a2fe55cfc0a4e9cc05c84ed73dccc5f401fce25c804c324ebf68796aadb933 -size 165752 diff --git a/examples/modules/csm/pages/suspension/index.adoc b/examples/modules/csm/pages/suspension/index.adoc index 13f2c4ec..3e4c1cd6 100644 --- a/examples/modules/csm/pages/suspension/index.adoc +++ b/examples/modules/csm/pages/suspension/index.adoc @@ -1,22 +1,16 @@ = Suspension Mechanics -Bereczki, Norbi -v1.0, 2018/01/13 -:toc: left -:stem: latexmath -ifdef::env-github,env-browser[] -:outfilesuffix: .adoc -:imagesdir: https://media.githubusercontent.com/media/feelpp/toolbox/master/csm/suspension/ -endif::[] - +:page-vtkjs: true == Introduction -image:suspension/image1.jpeg[232,190,float="left"] Examing the displacement of the wishbones by the effect of a sinusoidal excitation. An important part of the shock absorber is the wishbones, which is located at the wheel. Nowadays they are manufactured in many design, but the effect of the main loads is almost the same in all. Next, we will count on a general and simple arm. -image:suspension/image2.jpeg[s2.jpg,width=604,height=340] +[cols="40%,60%"] +|==== +a| image:suspension/image1.jpeg[width=100%] a| image:suspension/image2.jpeg[] +|==== == Model/Geometry @@ -51,17 +45,29 @@ NOTE: The result were run in time (two whole period, but in the pictures can be === Displacement - -NOTE: In the lower pictures a 20x scale factor was used to make the displacement easy to see. - -image:suspension/image7.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Keresztlengőkar\dx0.png,width=529,height=246] - -image:suspension/image8.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Keresztlengőkar\dx1.png,width=529,height=246] - -image:suspension/image9.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Keresztlengőkar\dx2.png,width=529,height=246] - -image:suspension/image10.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Keresztlengőkar\dx3.png,width=529,height=246] - -image:suspension/image11.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Keresztlengőkar\dx4.png,width=529,height=246] - -The maximum displacement is 1.778 mm. The design of the wishbones is very good because there is only little displacement due to the great force. +We display the displacement in the figures below. A 20x scale factor is used to make the displacement easy to see. +The maximum displacement is 1.778 mm. The design of the wishbones is very good because there is only little displacement due to the force. + +|==== +a| image:suspension/image7.png[] a| image:suspension/image8.png[] a| image:suspension/image9.png[] +a| image:suspension/image10.png[] a| image:suspension/image11.png[] | +|==== + +.3D interactive model +**** +Finally, we provide a 3D interactive model of the fishbone +++++ + +
+
+
+ + +++++ +**** diff --git a/examples/modules/csm/pages/suspension/suspension.cfg b/examples/modules/csm/pages/suspension/suspension.cfg index c6a1119f..86d45a1e 100644 --- a/examples/modules/csm/pages/suspension/suspension.cfg +++ b/examples/modules/csm/pages/suspension/suspension.cfg @@ -1,8 +1,12 @@ fe-approximation=P2 #P1,P2 +directory=toolboxes/solid/suspension/P2 [solid] filename=$cfgdir/suspension.json +mesh.filename=$cfgdir/suspension.msh +gmsh.partition=1 + material_law=StVenantKirchhoff# StVenantKirchhoff, NeoHookean # use density and material coeff cst in appli @@ -20,22 +24,12 @@ snes-ksp-maxit=1000 snes-ksp-maxit-reuse=100 # precondtioner config -pc-type=lu #lu,gasm,ml +pc-type=gamg#lu #lu,gasm,ml ksp-converged-reason=1 -mshfile=$cfgdir/suspension.msh -#[solid.gmsh] - [ts] time-step=0.1 time-final=6.28 #restart=true restart.at-last-save=true #save.freq=2 - -[exporter] -directory=applications/models/suspension/$solid_tag -freq=1 -#format=ensightgold - - diff --git a/examples/modules/csm/pages/suspension/suspension.json b/examples/modules/csm/pages/suspension/suspension.json index 79c1ea79..646461b3 100644 --- a/examples/modules/csm/pages/suspension/suspension.json +++ b/examples/modules/csm/pages/suspension/suspension.json @@ -2,22 +2,24 @@ { "Name": "Solid Mechanics ", "ShortName":"Solid", - "Model":"Elasticity", + "Models": + { + "equations":"Elasticity" + }, "Parameters": { "amplitudo": { "value":"5e1" }, - "omega": - { - "value":"2" - } + "omega": + { + "value":"2" + } }, "Materials": { "omega":{ - "name":"solid", "E":"200e3", "nu":"0.3", "rho":"7870e-9" @@ -45,11 +47,10 @@ }, "PostProcess": { - "Fields":["displacement"], - "Measures": - { - - } + "Exports": + { + "fields":["displacement"] + } } } diff --git a/examples/modules/csm/pages/t-beam/beam.cfg b/examples/modules/csm/pages/t-beam/beam.cfg index 15abef68..ee9b967d 100644 --- a/examples/modules/csm/pages/t-beam/beam.cfg +++ b/examples/modules/csm/pages/t-beam/beam.cfg @@ -1,8 +1,12 @@ fe-approximation=P2 #P1,P2 +directory=toolboxes/solid/t-beam/P2 [solid] -filename=/home/student2/feel/beam/beam.json +filename=$cfgdir/beam.json + +mesh.filename=$cfgdir/beam.geo +gmsh.hsize=10 on.type=elimination_symmetric @@ -11,12 +15,5 @@ pc-type=gamg #lu,gasm,ml ksp-monitor=1 # ksp-converged-reason=1 -geofile=/home/student2/feel/beam/beam.geo -[solid.gmsh] -hsize=10 - [ts] steady=true - -[exporter] -directory=applications/models/beam/$solid_tag diff --git a/examples/modules/csm/pages/t-beam/beam.json b/examples/modules/csm/pages/t-beam/beam.json index bf525357..d998cebe 100644 --- a/examples/modules/csm/pages/t-beam/beam.json +++ b/examples/modules/csm/pages/t-beam/beam.json @@ -1,12 +1,14 @@ { - "Name": "Solid Mechanics ", - "ShortName":"Solid", - "Model":"Elasticity", + "Name": "T-beam", + "ShortName":"T-beam", + "Models": + { + "equations":"Elasticity" + }, "Materials": { "omega": { - "name":"solid", "E":"210e3", //N/mm^2 "nu":"0.3", // "rho":"7870e-9" //kg/mm^3 @@ -34,18 +36,21 @@ }, "PostProcess": { - "Fields":["displacement","Von-Mises","tresca","principal-stresses"], + "Exports": + { + "fields":["displacement","Von-Mises","tresca","principal-stresses"] + }, "Measures": { - "VolumeVariation":"load", - "Maximum": - { - "load": - { - "markers":"load", - "fields":["displacement","stress","normal-stress","wall-shear-stress"] - } - } + "VolumeVariation":"load", + "Maximum": + { + "load": + { + "markers":"load", + "fields":["displacement"] } + } } + } } diff --git a/examples/modules/csm/pages/t-beam/images/media/image1.png b/examples/modules/csm/pages/t-beam/images/media/image1.png deleted file mode 100644 index db5e34bf..00000000 --- a/examples/modules/csm/pages/t-beam/images/media/image1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fe71bd37d5c8dc2c971ada67ab373b335168be4e39a6b9f0d944fb22b9b482f -size 17496 diff --git a/examples/modules/csm/pages/t-beam/images/media/image2.png b/examples/modules/csm/pages/t-beam/images/media/image2.png deleted file mode 100644 index ffa34473..00000000 --- a/examples/modules/csm/pages/t-beam/images/media/image2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b04458dd87f42513a30928c8b2ba00d563d09d39ba32fa4e8cdd45e1a5af4b06 -size 70153 diff --git a/examples/modules/csm/pages/t-beam/images/media/image3.png b/examples/modules/csm/pages/t-beam/images/media/image3.png deleted file mode 100644 index 42d437cc..00000000 --- a/examples/modules/csm/pages/t-beam/images/media/image3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae58590e5716c3c169bdcb44ddcaef40302615268d55dffbb03f4a52876fcb3e -size 49751 diff --git a/examples/modules/csm/pages/t-beam/images/media/image4.png b/examples/modules/csm/pages/t-beam/images/media/image4.png deleted file mode 100644 index 9edc3b9d..00000000 --- a/examples/modules/csm/pages/t-beam/images/media/image4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff92450e01d412c094098d1bcb348c5f91a1006a0d6db8bb1d1f01305589c4c4 -size 13482 diff --git a/examples/modules/csm/pages/t-beam/images/media/image5.png b/examples/modules/csm/pages/t-beam/images/media/image5.png deleted file mode 100644 index 4dca167b..00000000 --- a/examples/modules/csm/pages/t-beam/images/media/image5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1bd565d64ace8d066393ee92ce46696597e2ceff221e2b42f5921262e65115ea -size 43671 diff --git a/examples/modules/csm/pages/t-beam/images/media/image6.png b/examples/modules/csm/pages/t-beam/images/media/image6.png deleted file mode 100644 index 02eee5ac..00000000 --- a/examples/modules/csm/pages/t-beam/images/media/image6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc6685cbc23fcae2e852b4a6a4fc2b87cf334e2cfc35a6debdf93a6980dbcd4b -size 49384 diff --git a/examples/modules/csm/pages/t-beam/images/media/image7.png b/examples/modules/csm/pages/t-beam/images/media/image7.png deleted file mode 100644 index 325328ac..00000000 --- a/examples/modules/csm/pages/t-beam/images/media/image7.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e98fcce8dc16ccf8608fb2a754b20c25411e3a9f4113ce189b79a92cbb88ecac -size 59255 diff --git a/examples/modules/csm/pages/t-beam/index.adoc b/examples/modules/csm/pages/t-beam/index.adoc index 2b9d878e..f70a8c32 100644 --- a/examples/modules/csm/pages/t-beam/index.adoc +++ b/examples/modules/csm/pages/t-beam/index.adoc @@ -1,12 +1,5 @@ = T-beam -Futty, Gyula -v1.0, 2018/01/13 -:toc: left -:stem: latexmath -ifdef::env-github,env-browser[] -:outfilesuffix: .adoc -:imagesdir: https://media.githubusercontent.com/media/feelpp/toolbox/master/csm/t-beam/ -endif::[] +:page-vtkjs: true == Introduction @@ -59,12 +52,28 @@ Maximum displacement: 0.4854 mm NOTE: In the lower picture a 100x scale factor was used to make the displacement easy to see. -image:t-beam/image5.png[image,width=604,height=323] +image:t-beam/image5.png[] -image:t-beam/image6.png[image,width=604,height=323] +image:t-beam/image6.png[] === Von-Mises Criterions Maximum stress: 99,75 MPa -image:t-beam/image7.png[image,width=604,height=323] +image:t-beam/image7.png[] + +=== Model 3D + +++++ + +
+
+
+ + +++++ diff --git a/examples/modules/csm/pages/vierendeel-truss/Plate.cfg b/examples/modules/csm/pages/vierendeel-truss/Plate.cfg index b55a5804..4fd372c7 100644 --- a/examples/modules/csm/pages/vierendeel-truss/Plate.cfg +++ b/examples/modules/csm/pages/vierendeel-truss/Plate.cfg @@ -1,8 +1,12 @@ fe-approximation=P2 #P1,P2 +directory=toolboxes/solid/vierendeel-truss/Plate/P2 [solid] -filename=/home/student2/feel/Plate/Plate.json +filename=$cfgdir/Plate.json + +mesh.filename=$cfgdir/Plate.geo +gmsh.hsize=0.002 on.type=elimination_symmetric @@ -11,12 +15,5 @@ pc-type=gamg #lu,gasm,ml ksp-monitor=1 # ksp-converged-reason=1 -geofile=/home/student2/feel/Plate/Plate.geo -[solid.gmsh] -hsize=0.002 - [ts] steady=true - -[exporter] -directory=applications/models/solid/Plate/$solid_tag diff --git a/examples/modules/csm/pages/vierendeel-truss/Plate.json b/examples/modules/csm/pages/vierendeel-truss/Plate.json index 61917423..39542bd3 100644 --- a/examples/modules/csm/pages/vierendeel-truss/Plate.json +++ b/examples/modules/csm/pages/vierendeel-truss/Plate.json @@ -1,12 +1,14 @@ { "Name": "Solid Mechanics ", "ShortName":"Solid", - "Model":"Elasticity", + "Models": + { + "equations":"Elasticity" + }, "Materials": { "omega": //Aluminium { - "name":"solid", "E":"69e9", //N/m^2 "nu":"0.3", // "rho":"2712" //kg/m^3 @@ -16,7 +18,7 @@ { "displacement": { - "Dirichlet": + "Dirichlet": { "fixed": { @@ -34,7 +36,10 @@ }, "PostProcess": { - "Fields":["displacement","Von-Mises","tresca","principal-stresses"], + "Exports": + { + "fields":["displacement","Von-Mises","tresca","principal-stresses"] + }, "Measures": { "Points": diff --git a/examples/modules/csm/pages/vierendeel-truss/images/media/image1.png b/examples/modules/csm/pages/vierendeel-truss/images/media/image1.png deleted file mode 100644 index 48c5d174..00000000 --- a/examples/modules/csm/pages/vierendeel-truss/images/media/image1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b476fca7c424759a24ba9f260e53d82c8c0da11cfe6f78b1507f151f00d0f106 -size 138396 diff --git a/examples/modules/csm/pages/vierendeel-truss/images/media/image2.png b/examples/modules/csm/pages/vierendeel-truss/images/media/image2.png deleted file mode 100644 index 053f523d..00000000 --- a/examples/modules/csm/pages/vierendeel-truss/images/media/image2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e23e288be0262b608447223122708c75b0a738f0da13f0bb9b5aaf3304db9d78 -size 49974 diff --git a/examples/modules/csm/pages/vierendeel-truss/images/media/image3.png b/examples/modules/csm/pages/vierendeel-truss/images/media/image3.png deleted file mode 100644 index bccb2451..00000000 --- a/examples/modules/csm/pages/vierendeel-truss/images/media/image3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8569130adbf2c54be67e17453913cfd173bf14395ba09f45e266baaa7ebcd21 -size 10479 diff --git a/examples/modules/csm/pages/vierendeel-truss/images/media/image4.png b/examples/modules/csm/pages/vierendeel-truss/images/media/image4.png deleted file mode 100644 index 1aa79e35..00000000 --- a/examples/modules/csm/pages/vierendeel-truss/images/media/image4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60e425127d132697d719f2bb1af10782f3c0854ff9c98770052ca931c062a682 -size 51816 diff --git a/examples/modules/csm/pages/vierendeel-truss/images/media/image5.png b/examples/modules/csm/pages/vierendeel-truss/images/media/image5.png deleted file mode 100644 index 132a9471..00000000 --- a/examples/modules/csm/pages/vierendeel-truss/images/media/image5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7b1d9107fcca83674f41354387db7dc07b3abfc7bacbe4bde8757bfd8a1fa80 -size 258849 diff --git a/examples/modules/csm/pages/vierendeel-truss/images/media/image6.png b/examples/modules/csm/pages/vierendeel-truss/images/media/image6.png deleted file mode 100644 index c0c71a99..00000000 --- a/examples/modules/csm/pages/vierendeel-truss/images/media/image6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58b4509cef38e359a163cacf972d1ce2786d7ccb57453329c06cb3d115dc0c9b -size 107247 diff --git a/examples/modules/csm/pages/vierendeel-truss/index.adoc b/examples/modules/csm/pages/vierendeel-truss/index.adoc index 362c58ee..bfaf730d 100644 --- a/examples/modules/csm/pages/vierendeel-truss/index.adoc +++ b/examples/modules/csm/pages/vierendeel-truss/index.adoc @@ -1,12 +1,5 @@ = Vierendeel truss -Futty, Gyula -v1.0, 2018/01/13 -:toc: left -:stem: latexmath -ifdef::env-github,env-browser[] -:outfilesuffix: .adoc -:imagesdir: https://media.githubusercontent.com/media/feelpp/toolbox/master/csm/vierendeel-truss/ -endif::[] +:page-vtkjs: true == Introduction @@ -54,12 +47,29 @@ Maximum displacement: 1.498e-07 m NOTE: In the lower picture a scale factor was used to make the displacement easy to see. The distorted state is indicated by the wireframe model. -image:vierendeel-truss/image4.png[image,width=604,height=323] +image:vierendeel-truss/image4.png[] -image:vierendeel-truss/image5.png[image,width=604,height=323] +image:vierendeel-truss/image5.png[] === Von-Mises Criterions Maximum stress: 1.046e+05 Pa -image:vierendeel-truss/image6.png[image,width=604,height=323] +image:vierendeel-truss/image6.png[] + +=== Model 3D + +++++ + +
+
+
+ + +++++ +