]> https://gitweb.dealii.org/ - dealii.git/log
dealii.git
6 years agoCall the correct deleter for ReadWriteVector::values
Daniel Arndt [Sun, 29 Apr 2018 13:14:06 +0000 (15:14 +0200)]
Call the correct deleter for ReadWriteVector::values

6 years agoMerge pull request #6377 from kronbichler/matrix_free_fixes
Martin Kronbichler [Sun, 29 Apr 2018 06:19:19 +0000 (08:19 +0200)]
Merge pull request #6377 from kronbichler/matrix_free_fixes

Matrix free DG test fixes

6 years agoMerge pull request #6382 from drwells/remove-more-c++11-references
Denis Davydov [Sun, 29 Apr 2018 05:01:28 +0000 (07:01 +0200)]
Merge pull request #6382 from drwells/remove-more-c++11-references

Remove some references to C++11 support.

6 years agoMerge pull request #6383 from drwells/fix-doc-typos-9
Denis Davydov [Sun, 29 Apr 2018 04:55:04 +0000 (06:55 +0200)]
Merge pull request #6383 from drwells/fix-doc-typos-9

Fix more typos.

6 years agoMerge pull request #6380 from masterleinad/disable_sc_init
David Wells [Sun, 29 Apr 2018 02:17:30 +0000 (22:17 -0400)]
Merge pull request #6380 from masterleinad/disable_sc_init

Disable sc_init

6 years agoFix more typos. 6383/head
David Wells [Sun, 29 Apr 2018 01:26:34 +0000 (21:26 -0400)]
Fix more typos.

Work was done by codespell and the (newly fixed) double_word_typos.py script.

6 years agoRemove some references to C++11 support. 6382/head
David Wells [Sun, 29 Apr 2018 00:39:43 +0000 (20:39 -0400)]
Remove some references to C++11 support.

6 years agoMerge pull request #6379 from drwells/no-subscripers-noexcept
Daniel Arndt [Sat, 28 Apr 2018 23:31:14 +0000 (01:31 +0200)]
Merge pull request #6379 from drwells/no-subscripers-noexcept

Mark Subscriptor::check_no_subscribers as noexcept.

6 years agoMerge pull request #6378 from kronbichler/fix_vectorized_scatter
Daniel Arndt [Sat, 28 Apr 2018 21:01:11 +0000 (23:01 +0200)]
Merge pull request #6378 from kronbichler/fix_vectorized_scatter

Fix vectorized scatter for AVX-512

6 years agoDisable sc_init 6380/head
Daniel Arndt [Sat, 28 Apr 2018 20:33:44 +0000 (22:33 +0200)]
Disable sc_init

6 years agoMark Subscriptor::check_no_subscribers as noexcept. 6379/head
David Wells [Sat, 28 Apr 2018 16:49:05 +0000 (12:49 -0400)]
Mark Subscriptor::check_no_subscribers as noexcept.

Follow-up to a029a7f7acb7fe1a9bd30672b23da577af3c1932: since this function
should never throw we can mark it as noexcept.

This commit also updates relevant documentation explaining the present
behavior.

6 years agoMust check for all (l,j) pairs for possible conflicts in scatter. 6378/head
Martin Kronbichler [Sat, 28 Apr 2018 15:48:57 +0000 (17:48 +0200)]
Must check for all (l,j) pairs for possible conflicts in scatter.

6 years agoFix wrong assertion in case no SIMD is applied. 6377/head
Martin Kronbichler [Sat, 28 Apr 2018 15:24:07 +0000 (17:24 +0200)]
Fix wrong assertion in case no SIMD is applied.

6 years agoFix various compiler warnings.
Martin Kronbichler [Sat, 28 Apr 2018 15:23:48 +0000 (17:23 +0200)]
Fix various compiler warnings.

6 years agoProvide output options for various levels of vectorization.
Martin Kronbichler [Sat, 28 Apr 2018 15:17:43 +0000 (17:17 +0200)]
Provide output options for various levels of vectorization.

6 years agoMerge pull request #6370 from drwells/step-49-modernization-2
Wolfgang Bangerth [Sat, 28 Apr 2018 13:33:47 +0000 (07:33 -0600)]
Merge pull request #6370 from drwells/step-49-modernization-2

Update step-49.

6 years agoMerge pull request #6376 from masterleinad/fix_doxygen_comment
Denis Davydov [Sat, 28 Apr 2018 13:12:04 +0000 (15:12 +0200)]
Merge pull request #6376 from masterleinad/fix_doxygen_comment

Fix doxygen code style in FE_P1NC documentation

6 years agoFix doxygen code style in FE_P1NC documentation 6376/head
Daniel Arndt [Sat, 28 Apr 2018 12:19:56 +0000 (14:19 +0200)]
Fix doxygen code style in FE_P1NC documentation

6 years agoMerge pull request #6369 from drwells/restrict-tests
Daniel Arndt [Sat, 28 Apr 2018 08:30:47 +0000 (10:30 +0200)]
Merge pull request #6369 from drwells/restrict-tests

Add some third-party library restrictions to tests.

6 years agoMerge pull request #6365 from bangerth/fix-test
Daniel Arndt [Sat, 28 Apr 2018 08:30:30 +0000 (10:30 +0200)]
Merge pull request #6365 from bangerth/fix-test

Fix a test for GCC 4.8.4 by doing a cast explicitly.

6 years agoMerge pull request #6363 from drwells/remove-manifold-lib-includes
Daniel Arndt [Sat, 28 Apr 2018 08:30:19 +0000 (10:30 +0200)]
Merge pull request #6363 from drwells/remove-manifold-lib-includes

Remove extra manifold_lib.h inclusions.

6 years agoMerge pull request #6361 from tamiko/fix_race_condition_2
Daniel Arndt [Sat, 28 Apr 2018 08:29:45 +0000 (10:29 +0200)]
Merge pull request #6361 from tamiko/fix_race_condition_2

Tests: avoid concurrent run of a-framework/parameter_file_x

6 years agoUpdate step-49. 6370/head
David Wells [Sat, 28 Apr 2018 03:01:40 +0000 (23:01 -0400)]
Update step-49.

This clarifies the use of manifolds since GridGenerator now attaches manifolds
by default.

6 years agoAdd some third-party library restrictions to tests. 6369/head
David Wells [Fri, 27 Apr 2018 23:08:55 +0000 (19:08 -0400)]
Add some third-party library restrictions to tests.

6 years agoMerge pull request #6366 from bangerth/fix-test-2
Matthias Maier [Fri, 27 Apr 2018 19:50:40 +0000 (14:50 -0500)]
Merge pull request #6366 from bangerth/fix-test-2

Namespace qualify a function call.

6 years agoNamespace qualify a function call. 6366/head
Wolfgang Bangerth [Fri, 27 Apr 2018 19:38:10 +0000 (13:38 -0600)]
Namespace qualify a function call.

GCC 4.8.4 marks the call as ambiguous between std::to_string and
Patterns::Tools::to_string. Make the compiler happy by being
explicit, whether or not that is actually necessary.

6 years agoFix a test for GCC 4.8.4 by doing a cast explicitly. 6365/head
Wolfgang Bangerth [Fri, 27 Apr 2018 19:33:40 +0000 (13:33 -0600)]
Fix a test for GCC 4.8.4 by doing a cast explicitly.

6 years agoMerge pull request #6364 from drwells/remove-static-manifold
Jean-Paul Pelteret [Fri, 27 Apr 2018 19:17:22 +0000 (21:17 +0200)]
Merge pull request #6364 from drwells/remove-static-manifold

Remove a static manifold.

6 years agoRemove a static manifold. 6364/head
David Wells [Fri, 27 Apr 2018 17:39:37 +0000 (13:39 -0400)]
Remove a static manifold.

6 years agoRemove extra manifold_lib.h inclusions. 6363/head
David Wells [Fri, 27 Apr 2018 17:33:02 +0000 (13:33 -0400)]
Remove extra manifold_lib.h inclusions.

6 years agoMerge pull request #6362 from kronbichler/improve_fe_evaluation_doc
Matthias Maier [Fri, 27 Apr 2018 16:54:27 +0000 (11:54 -0500)]
Merge pull request #6362 from kronbichler/improve_fe_evaluation_doc

Improve documentation of FEEvaluation::submit_gradient & co

6 years agoSome random doc fixes. 6362/head
Martin Kronbichler [Fri, 27 Apr 2018 16:06:05 +0000 (18:06 +0200)]
Some random doc fixes.

6 years agoImprove matrix-free documentation.
Martin Kronbichler [Fri, 27 Apr 2018 16:05:55 +0000 (18:05 +0200)]
Improve matrix-free documentation.

6 years agoMerge pull request #6360 from masterleinad/update_readme
Matthias Maier [Fri, 27 Apr 2018 15:48:24 +0000 (10:48 -0500)]
Merge pull request #6360 from masterleinad/update_readme

Update readme.html

6 years agoMerge pull request #6359 from tamiko/fix_race_condition
Martin Kronbichler [Fri, 27 Apr 2018 15:47:17 +0000 (17:47 +0200)]
Merge pull request #6359 from tamiko/fix_race_condition

zoltan/tria_zoltan_01: Always run with mpirun annotation to avoid race condition

6 years agoTests: avoid concurrent run of a-framework/parameter_file_x 6361/head
Matthias Maier [Fri, 27 Apr 2018 15:33:43 +0000 (10:33 -0500)]
Tests: avoid concurrent run of a-framework/parameter_file_x

6 years agoUpdate readme.html 6360/head
Daniel Arndt [Fri, 27 Apr 2018 15:21:09 +0000 (17:21 +0200)]
Update readme.html

6 years agozoltan/tria_zoltan_01: Always run with mpirun annotation to avoid race condition 6359/head
Matthias Maier [Fri, 27 Apr 2018 15:29:22 +0000 (10:29 -0500)]
zoltan/tria_zoltan_01: Always run with mpirun annotation to avoid race condition

Closes #5773

6 years agoMerge pull request #6352 from drwells/fix-hyper-cube-with-cylindrical-hole
Matthias Maier [Fri, 27 Apr 2018 15:08:19 +0000 (10:08 -0500)]
Merge pull request #6352 from drwells/fix-hyper-cube-with-cylindrical-hole

Fix hyper cube with cylindrical hole

6 years agoFix manifold ids in a test. 6352/head
David Wells [Fri, 27 Apr 2018 15:01:03 +0000 (11:01 -0400)]
Fix manifold ids in a test.

This test previously relied on the 'unknown manifold id' logic: since
the interior manifold ids were 0 and that manifold was removed those
cells used FlatManifold during grid refinement. Now that the interior
manifold ids are set to numbers::flat_manifold_id this is no longer the
case.

6 years agoMerge pull request #6300 from kronbichler/issue_5667_dof_info
Matthias Maier [Fri, 27 Apr 2018 14:48:44 +0000 (09:48 -0500)]
Merge pull request #6300 from kronbichler/issue_5667_dof_info

Face loop functionality in MatrixFree, FEFaceEvaluation class, test cases

6 years agoMerge pull request #6330 from masterleinad/fix_dh_fe_collection_problem
Matthias Maier [Fri, 27 Apr 2018 14:36:44 +0000 (09:36 -0500)]
Merge pull request #6330 from masterleinad/fix_dh_fe_collection_problem

Only replace FECollection in *DoFHandler if necessary

6 years agoMerge pull request #6358 from masterleinad/fix_netcdf
Martin Kronbichler [Fri, 27 Apr 2018 14:25:31 +0000 (16:25 +0200)]
Merge pull request #6358 from masterleinad/fix_netcdf

Fix up remaining uses of 'output' in GridIn::read_netcdf

6 years agoFix up remainign uses of 'output'in GridIn::read_netcdf 6358/head
Daniel Arndt [Fri, 27 Apr 2018 13:44:57 +0000 (15:44 +0200)]
Fix up remainign uses of 'output'in GridIn::read_netcdf

6 years agoMerge pull request #6178 from luca-heltai/patterns-tools-utility-function
Matthias Maier [Fri, 27 Apr 2018 13:26:59 +0000 (08:26 -0500)]
Merge pull request #6178 from luca-heltai/patterns-tools-utility-function

Added to_string and to_value

6 years agoWrite changelog entries. 6300/head
Martin Kronbichler [Fri, 27 Apr 2018 12:49:36 +0000 (14:49 +0200)]
Write changelog entries.

6 years agoMerge pull request #6350 from masterleinad/fix_cuda_assert
Bruno Turcksin [Fri, 27 Apr 2018 12:34:54 +0000 (08:34 -0400)]
Merge pull request #6350 from masterleinad/fix_cuda_assert

Allow Asserts for functions running on host

6 years agoAllow Asserts for functions running on host 6350/head
Daniel Arndt [Thu, 26 Apr 2018 21:45:12 +0000 (23:45 +0200)]
Allow Asserts for functions running on host

6 years agoFailing test in mapping q eulerian. 6330/head
Luca Heltai [Wed, 25 Apr 2018 13:00:42 +0000 (15:00 +0200)]
Failing test in mapping q eulerian.

6 years agoOnly replace FECollection in *DoFHandler if necessary
Luca Heltai [Wed, 25 Apr 2018 09:32:56 +0000 (11:32 +0200)]
Only replace FECollection in *DoFHandler if necessary

6 years agoComparison operator for FiniteElement and FECollection
Daniel Arndt [Fri, 27 Apr 2018 09:22:04 +0000 (11:22 +0200)]
Comparison operator for FiniteElement and FECollection

6 years agoMerge pull request #6346 from tamiko/minor_updates
Martin Kronbichler [Fri, 27 Apr 2018 11:42:01 +0000 (13:42 +0200)]
Merge pull request #6346 from tamiko/minor_updates

License header updates

6 years agoMerge pull request #6344 from masterleinad/fix_cppcheck
Martin Kronbichler [Fri, 27 Apr 2018 11:37:09 +0000 (13:37 +0200)]
Merge pull request #6344 from masterleinad/fix_cppcheck

Fix issues reported by cppcheck

6 years agoConsistently use 'const bool' in function definitions.
David Wells [Fri, 27 Apr 2018 02:26:36 +0000 (22:26 -0400)]
Consistently use 'const bool' in function definitions.

6 years agoDo not curve outside cells with hyper_cube_with_cylindrical_hole.
David Wells [Fri, 27 Apr 2018 02:25:40 +0000 (22:25 -0400)]
Do not curve outside cells with hyper_cube_with_cylindrical_hole.

6 years agoUse an enum rather than a plain number to index into dof index arrays.
Martin Kronbichler [Thu, 26 Apr 2018 11:35:01 +0000 (13:35 +0200)]
Use an enum rather than a plain number to index into dof index arrays.

6 years agoAdd 37 test files checking many aspects of FEFaceEvaluation.
Martin Kronbichler [Wed, 25 Apr 2018 17:46:07 +0000 (19:46 +0200)]
Add 37 test files checking many aspects of FEFaceEvaluation.

6 years agoIntroduce the new class FEFaceEvaluation. Speed up vector access for contiguous case.
Katharina Kormann [Wed, 25 Apr 2018 16:47:34 +0000 (18:47 +0200)]
Introduce the new class FEFaceEvaluation. Speed up vector access for contiguous case.

6 years agoFix the setup of face connectivity.
Martin Kronbichler [Wed, 25 Apr 2018 16:24:21 +0000 (18:24 +0200)]
Fix the setup of face connectivity.

6 years agoAdd tests for multiple components in single DoFHandler.
Martin Kronbichler [Thu, 26 Apr 2018 15:57:47 +0000 (17:57 +0200)]
Add tests for multiple components in single DoFHandler.

6 years agoIntroduce face loop functionality in MatrixFree. Rework DoFInfo.
Martin Kronbichler [Mon, 23 Apr 2018 18:08:19 +0000 (20:08 +0200)]
Introduce face loop functionality in MatrixFree. Rework DoFInfo.

6 years agoMake sure that FE_Nothing can be identified by its name
Daniel Arndt [Thu, 26 Apr 2018 22:58:48 +0000 (00:58 +0200)]
Make sure that FE_Nothing can be identified by its name

6 years agoMerge pull request #6303 from Rombur/cuda_chol
Martin Kronbichler [Fri, 27 Apr 2018 06:49:22 +0000 (08:49 +0200)]
Merge pull request #6303 from Rombur/cuda_chol

Direct solvers on GPU

6 years agoupdate copyright 6346/head
Matthias Maier [Thu, 26 Apr 2018 21:15:50 +0000 (16:15 -0500)]
update copyright

6 years agomanually fix garbled header
Matthias Maier [Thu, 26 Apr 2018 21:04:50 +0000 (16:04 -0500)]
manually fix garbled header

6 years agoUpdate LICENSE file
Matthias Maier [Thu, 26 Apr 2018 17:32:02 +0000 (12:32 -0500)]
Update LICENSE file

Good news - ./contrib does not contain any third-party stuff any more
and is exclusively copyrighted by us and licensed under LGPL-2.1 or
later.

6 years agoContrib: Improve update-copyright script
Matthias Maier [Thu, 26 Apr 2018 17:21:35 +0000 (12:21 -0500)]
Contrib: Improve update-copyright script

6 years agoAdd changelog entry 6303/head
Bruno Turcksin [Mon, 23 Apr 2018 22:41:31 +0000 (18:41 -0400)]
Add changelog entry

6 years agoRemove unnecessary code
Bruno Turcksin [Mon, 23 Apr 2018 22:38:52 +0000 (18:38 -0400)]
Remove unnecessary code

6 years agoAdd test for direct solvers on the device
Bruno Turcksin [Mon, 23 Apr 2018 22:38:13 +0000 (18:38 -0400)]
Add test for direct solvers on the device

6 years agoAdd direct solver on the device
Bruno Turcksin [Mon, 23 Apr 2018 22:37:33 +0000 (18:37 -0400)]
Add direct solver on the device

6 years agoAdd handles for cuSOLVER and cuSPARSE in Utilities::CUDA::Handle
Bruno Turcksin [Mon, 23 Apr 2018 22:32:37 +0000 (18:32 -0400)]
Add handles for cuSOLVER and cuSPARSE in Utilities::CUDA::Handle

6 years agoAdd cuSOLVER asserts
Bruno Turcksin [Mon, 23 Apr 2018 22:28:49 +0000 (18:28 -0400)]
Add cuSOLVER asserts

6 years agoAdd support for cuSOLVER in build system
Bruno Turcksin [Mon, 23 Apr 2018 22:25:50 +0000 (18:25 -0400)]
Add support for cuSOLVER in build system

6 years agoAddress comments 6344/head
Daniel Arndt [Thu, 26 Apr 2018 20:38:06 +0000 (22:38 +0200)]
Address comments

6 years agoMerge pull request #6347 from jppelteret/follow_up_to_6335
Matthias Maier [Thu, 26 Apr 2018 17:53:21 +0000 (12:53 -0500)]
Merge pull request #6347 from jppelteret/follow_up_to_6335

CMake: Add missing boost headers to AdolC module

6 years agoMerge pull request #6345 from tamiko/cppcheck
Martin Kronbichler [Thu, 26 Apr 2018 17:48:23 +0000 (19:48 +0200)]
Merge pull request #6345 from tamiko/cppcheck

Bugfix: Close #ifdef at the right point

6 years agoCMake: Add missing boost headers to AdolC module 6347/head
Jean-Paul Pelteret [Thu, 26 Apr 2018 17:45:15 +0000 (19:45 +0200)]
CMake: Add missing boost headers to AdolC module

6 years agoMerge pull request #6335 from tamiko/fix_adolc_test
Jean-Paul Pelteret [Thu, 26 Apr 2018 17:24:42 +0000 (19:24 +0200)]
Merge pull request #6335 from tamiko/fix_adolc_test

CMake: Link in Boost libraries for ADOLc check

6 years agoBugfix: Close #ifdef at the right point 6345/head
Matthias Maier [Thu, 26 Apr 2018 16:59:44 +0000 (11:59 -0500)]
Bugfix: Close #ifdef at the right point

This was found by cppcheck that rightfully complains about the #endif
statement closing at the wrong position.

6 years agoMerge pull request #6340 from drwells/update-copyright-notices-2
Luca Heltai [Thu, 26 Apr 2018 15:06:10 +0000 (17:06 +0200)]
Merge pull request #6340 from drwells/update-copyright-notices-2

Update copyright notices 2

6 years agoMerge pull request #6290 from GivAlz/fix_distributed_cpt_loc
Martin Kronbichler [Thu, 26 Apr 2018 15:04:13 +0000 (17:04 +0200)]
Merge pull request #6290 from GivAlz/fix_distributed_cpt_loc

Fixed distributed cpt locations return tuple and added test

6 years agoFix issues reported by cppcheck
Daniel Arndt [Thu, 26 Apr 2018 14:40:47 +0000 (16:40 +0200)]
Fix issues reported by cppcheck

6 years agoCMake: simplify check 6335/head
Matthias Maier [Wed, 25 Apr 2018 20:44:52 +0000 (15:44 -0500)]
CMake: simplify check

6 years agoCMake: Add boost and adolc compatibility check
Matthias Maier [Wed, 25 Apr 2018 20:41:00 +0000 (15:41 -0500)]
CMake: Add boost and adolc compatibility check

Make sure to only ever use an external ADOL-C library (that uses the
Boost pool allocator and is linked against external boost) if deal.II is
also configured with external Boost.

6 years agoCMake: Let FindADOLC.cmake check whether adolc uses Boost pool allocator
Matthias Maier [Wed, 25 Apr 2018 20:23:17 +0000 (15:23 -0500)]
CMake: Let FindADOLC.cmake check whether adolc uses Boost pool allocator

Let the find module check whether adolc uses the Boost pool allocator.
If yes, add all boost libraries to the link interface.

6 years agoCMake: add a safeguard
Matthias Maier [Wed, 25 Apr 2018 18:14:49 +0000 (13:14 -0500)]
CMake: add a safeguard

6 years agoCMake: run boost configure before adolc configure
Matthias Maier [Wed, 25 Apr 2018 18:12:50 +0000 (13:12 -0500)]
CMake: run boost configure before adolc configure

6 years agoMerge pull request #6341 from masterleinad/fix_subscribe_move
Martin Kronbichler [Thu, 26 Apr 2018 11:45:13 +0000 (13:45 +0200)]
Merge pull request #6341 from masterleinad/fix_subscribe_move

Only run assign_subscriptor in Debug mode

6 years agoOnly run assign_subscriptor in Debug mode 6341/head
Daniel Arndt [Thu, 26 Apr 2018 08:16:32 +0000 (10:16 +0200)]
Only run assign_subscriptor in Debug mode

6 years agoMerge pull request #6337 from drwells/update-gridgenerator-examples-3
Denis Davydov [Thu, 26 Apr 2018 07:51:19 +0000 (09:51 +0200)]
Merge pull request #6337 from drwells/update-gridgenerator-examples-3

Update gridgenerator examples 3

6 years agoUpdate step-15 results. 6337/head
David Wells [Wed, 25 Apr 2018 20:20:39 +0000 (16:20 -0400)]
Update step-15 results.

6 years agoUse VTU output in step-15.
David Wells [Wed, 25 Apr 2018 20:16:27 +0000 (16:16 -0400)]
Use VTU output in step-15.

6 years agoMerge pull request #6333 from masterleinad/fix_subscribe_move
David Wells [Thu, 26 Apr 2018 03:17:16 +0000 (23:17 -0400)]
Merge pull request #6333 from masterleinad/fix_subscribe_move

Check own subscriptions when assigning in Subscriptor

6 years agoReformat some copyright headers. 6340/head
David Wells [Thu, 26 Apr 2018 02:12:56 +0000 (22:12 -0400)]
Reformat some copyright headers.

6 years agoReassign copyright from mathlab to deal.II.
David Wells [Thu, 26 Apr 2018 02:12:32 +0000 (22:12 -0400)]
Reassign copyright from mathlab to deal.II.

Done with the permission of Luca Heltai.

6 years agoMerge pull request #6331 from tjhei/update_copyright
David Wells [Thu, 26 Apr 2018 01:55:28 +0000 (21:55 -0400)]
Merge pull request #6331 from tjhei/update_copyright

update copyright years

6 years agoFixed minor comments. 6178/head
Luca Heltai [Wed, 25 Apr 2018 22:17:03 +0000 (00:17 +0200)]
Fixed minor comments.

6 years agoMerge pull request #6304 from drwells/update-gridgenerator-examples-2
Bruno Turcksin [Wed, 25 Apr 2018 21:23:32 +0000 (17:23 -0400)]
Merge pull request #6304 from drwells/update-gridgenerator-examples-2

Update gridgenerator examples 2

6 years agoChange step-10 to use FE_Nothing. 6304/head
David Wells [Sun, 22 Apr 2018 23:46:05 +0000 (19:46 -0400)]
Change step-10 to use FE_Nothing.


In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.