Skip to content

Commit

Permalink
Merge pull request #51 from KristofferC/kc/dim_param
Browse files Browse the repository at this point in the history
Use ContMechTensors whith JuAFEM
  • Loading branch information
KristofferC committed Apr 2, 2016
2 parents 8f1e4aa + 5cd2398 commit 2aac092
Show file tree
Hide file tree
Showing 26 changed files with 1,261 additions and 493 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
*.jl.cov
*.jl.*.cov
*.jl.mem
*.vtu
*.pvd
examples/.ipynb_checkpoints/
/doc/_build/
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ notifications:
# uncomment the following lines to override the default test script
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'Pkg.add("InplaceOps");'
- julia -e 'Pkg.add("Devectorize");'
- julia -e 'Pkg.clone("https://github.com/KristofferC/FastGaussQuadrature.jl");'
- julia -e 'Pkg.clone("https://github.com/KristofferC/ContMechTensors.jl")'
- julia -e 'Pkg.clone(pwd()); Pkg.test("JuAFEM"; coverage=true)'
after_success:
- julia -e 'cd(Pkg.dir("JuAFEM")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
1 change: 1 addition & 0 deletions REQUIRE
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ Winston
Compat
WriteVTK
Reexport
ContMechTensors
4 changes: 1 addition & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ build_script:
# Need to convert from shallow to complete for Pkg.clone to work
- IF EXIST .git\shallow (git fetch --unshallow)
- C:\projects\julia\bin\julia -e "versioninfo();
Pkg.clone(\"https://github.com/KristofferC/FastGaussQuadrature.jl\");
Pkg.add(\"InplaceOps\");
Pkg.clone(\"https://github.com/KristofferC/ContMechTensors.jl\");
Pkg.clone(pwd(), \"JuAFEM\");
Pkg.add(\"Devectorize\");

test_script:
- C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"JuAFEM\")"
25 changes: 9 additions & 16 deletions doc/api/fe_values.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ An example of creating a ``FEValues`` object is shown below.
Upon creation, ``FEValues`` caches the values of the shape functions and derivatives in the quadrature points.

The points of FEValues is that for each element you call ``reinit!(fev, x)`` where ``x`` is the coordinate matrix for an element. This will update the global shape function derivatives, jacobians, weights etc.
The points of FEValues is that for each element you call ``reinit!(fev, x)`` where ``x`` is a `Vector` of `Tensor{1}`s. This will update the global shape function derivatives, jacobians, weights etc.

Different queries can now be performed.

Expand All @@ -64,25 +64,18 @@ Shape function queries
Gets the value of the shape function at a given quadrature point and given base function

.. function:: shape_gradient(fe_v, q_point::Int) -> gradient::Matrix
.. function:: shape_gradient(fe_v, q_point::Int) -> gradients::Vector{Tensor{2}}

.. Docstring generated from Julia source
Get the gradients of the shape functions for a given quadrature point

.. function:: shape_gradient(fe_v, q_point::Int, base_func::Int) -> gradient::Vector
.. function:: shape_gradient(fe_v, q_point::Int, base_func::Int) -> gradient::Tensor{2}

.. Docstring generated from Julia source
Get the gradient of the shape functions for a given quadrature point and base function

.. function:: shape_gradient(fe_v, q_point::Int, base_func::Int, component::Int) -> gradient_component

.. Docstring generated from Julia source
Get the gradient of the shape functions for a given quadrature point, base function and component


Discretized function queries
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand All @@ -94,25 +87,25 @@ We can also compute different operatiors on a finite element discretized functio
Computes the value in a quadrature point for a scalar valued function

.. function:: function_scalar_gradient!(grad::Vector, fe_v, q_point::Int, u::Vector) -> gradient
.. function:: function_vector_value(fe_v, q_point::Int, u::Vector{Tensor{1}}) -> value::Tensor{1}

.. Docstring generated from Julia source
Computes the gradient in a quadrature point for a scalar valued function. Result is stored in ``grad``\ .
Computes the value in a quadrature point for a vector valued function.

.. function:: function_vector_gradient!(grad::Matrix, fe_v, q_point::Int, u::Vector) -> gradient
.. function:: function_scalar_gradient(fe_v, q_point::Int, u::Vector) -> grad::Tensor{1}

.. Docstring generated from Julia source
Computes the gradient (jacobian) in a quadrature point for a vector valued function. Result is stored in ``grad``\ .
Computes the gradient in a quadrature point for a scalar valued function.

.. function:: function_vector_symmetric_gradient!(grad::Matrix, fe_v, q_point::Int, u::Vector) -> sym_gradient
.. function:: function_vector_symmetric_gradient(fe_v, q_point::Int, u::Vector{Tensor{1}}) -> sym_grad::SymmetricTensor{2}

.. Docstring generated from Julia source
Computes the symmetric gradient (jacobian) in a quadrature point for a vector valued function. Result is stored in ``grad``\ .

.. function:: function_vector_divergence(fe_v, q_point::Int, u::Vector) -> divergence
.. function:: function_vector_divergence(fe_v, q_point::Int, u::Vector{Tensor{1}}) -> divergence

.. Docstring generated from Julia source
Expand Down
Loading

0 comments on commit 2aac092

Please sign in to comment.