From b8508b13edf239f98cd9f4a69303cfe844430873 Mon Sep 17 00:00:00 2001 From: David Seus <david.seus@ians.uni-stuttgart.de> Date: Tue, 24 Sep 2019 11:29:42 +0200 Subject: [PATCH] clean up and reorganise repo --- .../praeambels_and_definitions/.dropbox.attr | 1 - .../theoreme_und_farbe.tex | 321 ---------- .../L-Schema_Paper_makros.tex | 92 --- .../artikel_theoreme_und_farbe.tex | 383 ------------ .../artikelpraeambel.tex | 452 -------------- .../lualatexartikelpraeambel.tex | 340 ----------- .../special_symbols.tex | 206 ------- .../theoreme_und_farbe.tex | 366 ------------ .../plots/subsequent_errors.tex | 149 ----- ...ti-patch-with-gravity-constant-solution.py | 0 .../RR-multi-patch-with-gravity.py | 0 .../plots/Makefile | 0 ...-exact-solution-over-time-with-gravity.dep | 0 ...-exact-solution-over-time-with-gravity.png | Bin .../Errornorm-exact-solution-over-time.dep | 0 .../Errornorm-exact-solution-over-time.png | Bin .../RR-2-patch-subsequent_errors_t0.00.dep | 0 .../RR-2-patch-subsequent_errors_t0.00.png | Bin .../RR-2-patch-subsequent_errors_t0.01.dep | 0 .../RR-2-patch-subsequent_errors_t0.01.png | Bin .../RR-2-patch-subsequent_errors_t0.02.dep | 0 .../RR-2-patch-subsequent_errors_t0.02.png | Bin .../RR-2-patch-subsequent_errors_t0.03.dep | 0 .../RR-2-patch-subsequent_errors_t0.03.png | Bin .../RR-2-patch-subsequent_errors_t0.04.dep | 0 .../RR-2-patch-subsequent_errors_t0.04.png | Bin .../RR-2-patch-subsequent_errors_t0.05.dep | 0 .../RR-2-patch-subsequent_errors_t0.05.png | Bin .../RR-2-patch-subsequent_errors_t0.06.dep | 0 .../RR-2-patch-subsequent_errors_t0.06.png | Bin .../RR-2-patch-subsequent_errors_t0.07.dep | 0 .../RR-2-patch-subsequent_errors_t0.07.png | Bin .../RR-2-patch-subsequent_errors_t0.08.dep | 0 .../RR-2-patch-subsequent_errors_t0.08.png | Bin .../RR-2-patch-subsequent_errors_t0.12.dep | 0 .../RR-2-patch-subsequent_errors_t0.12.png | Bin .../RR-2-patch-subsequent_errors_t0.16.dep | 0 .../RR-2-patch-subsequent_errors_t0.16.png | Bin .../RR-2-patch-subsequent_errors_t0.20.dep | 0 .../RR-2-patch-subsequent_errors_t0.20.png | Bin .../RR-2-patch-subsequent_errors_t0.24.dep | 0 .../RR-2-patch-subsequent_errors_t0.24.png | Bin .../RR-2-patch-subsequent_errors_t0.28.dep | 0 .../RR-2-patch-subsequent_errors_t0.28.png | Bin .../RR-2-patch-subsequent_errors_t0.32.dep | 0 .../RR-2-patch-subsequent_errors_t0.32.png | Bin .../RR-2-patch-subsequent_errors_t0.36.dep | 0 .../RR-2-patch-subsequent_errors_t0.36.png | Bin ...es20_dt0.01_exact_solution_error_norms.tex | 0 .../meshres20_dt0.01_subsequent_errors.tex | 0 .../praeambels_and_definitions/.dropbox.attr | 0 .../theoreme_und_farbe.tex | 0 .../L-Schema_Paper_makros.tex | 0 .../artikel_theoreme_und_farbe.tex | 0 .../artikelpraeambel.tex | 0 .../lualatexartikelpraeambel.tex | 0 .../special_symbols.tex | 0 .../theoreme_und_farbe.tex | 0 .../plots/subsequent_errors.tex | 0 ...atch-with-inner-patch-constant-solution.py | 0 .../RR-multi-patch-with-inner-patch.py | 0 .../RR-2-patch-symmetric.py | 0 .../RR-2-patch-test.py | 0 ...ame-wetting-phase-as-RR-zero-nonwetting.py | 0 .../TP-R-2-patch-test-constant-solution.py | 0 .../TP-R-2-patch-test.py | 0 .../mesh_studies/TP-R-2-patch-mesh-study.py | 0 Test_misc/taaaeeeeeeschd.py | 45 -- .../TP-TP-layered_soil-const-solution.py | 0 ...ed_soil_with_inner_patch_const_solution.py | 0 ...nner_patch-realistic-split-up-interface.py | 0 ...layered_soil_with_inner_patch-realistic.py | 0 .../TP-TP-layered_soil_with_inner_patch.py | 0 .../TP-TP-layered_soil-second-example.py | 0 .../TP-TP-layered_soil.py | 0 .../TP-TP-layered_soil_pure_dd.py | 0 .../TP-TP-layered_soil_pure_dd_mesh_study.py | 0 ...h-with-gravity-same-wetting-phase-as-RR.py | 0 .../old_geometry.py | 0 .../TP-one-patch}/TP-one-patch-alterantive.py | 0 .../TP-one-patch-linear-koefficients.py | 0 .../TP-one-patch-purely-postive-pc.py | 0 .../one-patch/TP-one-patch}/TP-one-patch.py | 0 .../debug_tests/R-one-patch-const-in-time.py | 0 .../R-one-patch-mesh-study-alternative.py | 0 .../mesh_study/R-one-patch-mesh-study.py | 0 .../mesh_study/TP-one-patch-mesh-study.py | 0 .../R-one-patch-mesh-study-fixed-timestep.py | 0 ...study-fixed-timestep-constant-pressures.py | 0 ...h-mesh-study-fixed-timestep-nonwetting0.py | 0 ...atch-mesh-study-fixed-timestep-wetting0.py | 0 .../TP-one-patch-mesh-study-fixed-timestep.py | 0 .../TP-TP-2-patch-constant-solution.py | 0 ...l-interface-avoiding-origin-alternative.py | 554 ++++++++++++++++++ ...dd-horizontal-interface-avoiding-origin.py | 0 ...zontal-tilted-interface-avoiding-origin.py | 0 ...re-dd-corner_subdomains-avoiding-origin.py | 0 ...TP-TP-2-patch-pure-dd-convergence-study.py | 0 .../TP-TP-2-patch-alterantive.py | 0 .../TP-TP-2-patch-test.py | 0 .../TP-TP-2-patch-test.py | 0 layered-soil-case/layered_soil.py | 134 ----- 102 files changed, 554 insertions(+), 2489 deletions(-) delete mode 100755 RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/.dropbox.attr delete mode 100644 RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/Diplomarbeitsskriptpraeambel/theoreme_und_farbe.tex delete mode 100644 RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/L-Schema_Paper_makros.tex delete mode 100644 RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikel_theoreme_und_farbe.tex delete mode 100644 RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikelpraeambel.tex delete mode 100644 RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/lualatexartikelpraeambel.tex delete mode 100644 RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/special_symbols.tex delete mode 100644 RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/theoreme_und_farbe.tex delete mode 100644 RR-multi-patch-plus-gravity/plots/subsequent_errors.tex rename {RR-multi-patch-plus-gravity-const-solution => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity-const-solution}/RR-multi-patch-with-gravity-constant-solution.py (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/RR-multi-patch-with-gravity.py (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Makefile (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/Errornorm-exact-solution-over-time-with-gravity.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/Errornorm-exact-solution-over-time-with-gravity.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/Errornorm-exact-solution-over-time.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/Errornorm-exact-solution-over-time.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.00.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.00.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.01.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.01.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.02.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.02.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.03.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.03.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.04.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.04.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.05.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.05.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.06.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.06.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.07.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.07.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.08.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.08.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.12.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.12.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.16.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.16.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.20.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.20.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.24.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.24.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.28.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.28.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.32.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.32.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.36.dep (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.36.png (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/meshres20_dt0.01_exact_solution_error_norms.tex (100%) rename {RR-multi-patch-plus-gravity => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/meshres20_dt0.01_subsequent_errors.tex (100%) rename {RR-2-patch-test-case => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/praeambels_and_definitions/.dropbox.attr (100%) rename {RR-2-patch-test-case => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/praeambels_and_definitions/Diplomarbeitsskriptpraeambel/theoreme_und_farbe.tex (100%) rename {RR-2-patch-test-case => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/praeambels_and_definitions/L-Schema_Paper_makros.tex (100%) rename {RR-2-patch-test-case => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/praeambels_and_definitions/artikel_theoreme_und_farbe.tex (100%) rename {RR-2-patch-test-case => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/praeambels_and_definitions/artikelpraeambel.tex (100%) rename {RR-2-patch-test-case => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/praeambels_and_definitions/lualatexartikelpraeambel.tex (100%) rename {RR-2-patch-test-case => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/praeambels_and_definitions/special_symbols.tex (100%) rename {RR-2-patch-test-case => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/praeambels_and_definitions/theoreme_und_farbe.tex (100%) rename {RR-2-patch-test-case => Richards-Richards/multi-patch/RR-multi-patch-plus-gravity}/plots/subsequent_errors.tex (100%) rename {RR-multi-patch-with-inner-patch-const-solution => Richards-Richards/multi-patch/RR-multi-patch-with-inner-patch-const-solution}/RR-multi-patch-with-inner-patch-constant-solution.py (100%) rename {RR-multi-patch-with-inner-patch => Richards-Richards/multi-patch/RR-multi-patch-with-inner-patch}/RR-multi-patch-with-inner-patch.py (100%) rename {RR-2-patch-symmetric-analytic-soltion => Richards-Richards/two-patch/RR-two-patch-symmetric-analytic-soltion}/RR-2-patch-symmetric.py (100%) rename {RR-2-patch-test-case => Richards-Richards/two-patch/RR-two-patch-test-case}/RR-2-patch-test.py (100%) rename {TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting => Richards-Two-phase/multi-patch/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting}/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting.py (100%) rename {TP-R-two-patch-test-case-constant-solution => Richards-Two-phase/two-patch/TP-R-two-patch-test-case-constant-solution}/TP-R-2-patch-test-constant-solution.py (100%) rename {TP-R-two-patch-test-case => Richards-Two-phase/two-patch/TP-R-two-patch-test-case}/TP-R-2-patch-test.py (100%) rename {TP-R-two-patch-test-case => Richards-Two-phase/two-patch/TP-R-two-patch-test-case}/mesh_studies/TP-R-2-patch-mesh-study.py (100%) delete mode 100755 Test_misc/taaaeeeeeeschd.py rename {TP-TP-layered-soil-case-const-solution => Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-const-solution}/TP-TP-layered_soil-const-solution.py (100%) rename {TP-TP-layered-soil-case-with-inner-patch-constant-solution => Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch-constant-solution}/TP-TP-layered_soil_with_inner_patch_const_solution.py (100%) rename {TP-TP-layered-soil-case-with-inner-patch => Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch}/TP-TP-layered_soil_with_inner_patch-realistic-split-up-interface.py (100%) rename {TP-TP-layered-soil-case-with-inner-patch => Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch}/TP-TP-layered_soil_with_inner_patch-realistic.py (100%) rename {TP-TP-layered-soil-case-with-inner-patch => Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch}/TP-TP-layered_soil_with_inner_patch.py (100%) rename {TP-TP-layered-soil-case => Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case}/TP-TP-layered_soil-second-example.py (100%) rename {TP-TP-layered-soil-case => Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case}/TP-TP-layered_soil.py (100%) rename {TP-TP-layered-soil-case => Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case}/TP-TP-layered_soil_pure_dd.py (100%) rename {TP-TP-layered-soil-case => Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case}/mesh_study/TP-TP-layered_soil_pure_dd_mesh_study.py (100%) rename {TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR => Two-phase-Two-phase/multi-patch/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR}/TP-multi-patch-with-gravity-same-wetting-phase-as-RR.py (100%) rename {TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR => Two-phase-Two-phase/multi-patch/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR}/old_geometry.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/TP-one-patch-alterantive.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/TP-one-patch-linear-koefficients.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/TP-one-patch-purely-postive-pc.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/TP-one-patch.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/debug_tests/R-one-patch-const-in-time.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/mesh_study/R-one-patch-mesh-study-alternative.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/mesh_study/R-one-patch-mesh-study.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/mesh_study/TP-one-patch-mesh-study.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/mesh_study_for_fixed_timestep/R-one-patch-mesh-study-fixed-timestep.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-constant-pressures.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-nonwetting0.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-wetting0.py (100%) rename {TP-one-patch => Two-phase-Two-phase/one-patch/TP-one-patch}/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep.py (100%) rename {TP-TP-2-patch-constant-solution => Two-phase-Two-phase/two-patch/TP-TP-2-patch-constant-solution}/TP-TP-2-patch-constant-solution.py (100%) create mode 100755 Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-horizontal-interface-avoiding-origin-alternative.py rename {TP-TP-2-patch-pure-dd-avoid-interface-at-origin => Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin}/TP-TP-2-patch-pure-dd-horizontal-interface-avoiding-origin.py (100%) rename {TP-TP-2-patch-pure-dd-avoid-interface-at-origin => Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin}/TP-TP-2-patch-pure-dd-tilted-interface/TP-TP-2-patch-pure-dd-horizontal-tilted-interface-avoiding-origin.py (100%) rename {TP-TP-2-patch-pure-dd-avoid-interface-at-origin => Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin}/corner_subdomains/TP-TP-4-patch-pure-dd-corner_subdomains-avoiding-origin.py (100%) rename {TP-TP-2-patch-pure-dd-avoid-interface-at-origin => Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin}/mesh_study_convergence/TP-TP-2-patch-pure-dd-convergence-study.py (100%) rename {TP-TP-2-patch-test-case => Two-phase-Two-phase/two-patch/TP-TP-2-patch-test-case}/TP-TP-2-patch-alterantive.py (100%) rename {TP-TP-2-patch-test-case => Two-phase-Two-phase/two-patch/TP-TP-2-patch-test-case}/TP-TP-2-patch-test.py (100%) rename {TP-TP-patch-test-case => Two-phase-Two-phase/two-patch/archive/TP-TP-patch-test-case}/TP-TP-2-patch-test.py (100%) delete mode 100755 layered-soil-case/layered_soil.py diff --git a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/.dropbox.attr b/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/.dropbox.attr deleted file mode 100755 index 9e26dfe..0000000 --- a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/.dropbox.attr +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/Diplomarbeitsskriptpraeambel/theoreme_und_farbe.tex b/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/Diplomarbeitsskriptpraeambel/theoreme_und_farbe.tex deleted file mode 100644 index 91d7dc6..0000000 --- a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/Diplomarbeitsskriptpraeambel/theoreme_und_farbe.tex +++ /dev/null @@ -1,321 +0,0 @@ -%FARBDEFINTIONEN -%\definecolor{dunkelblau}{rgb}{0.21,0.37,0.87}definert neue Farben. Mit rgb-Werten in % mit RGB kann man die %RGB werte driket angeben -%BLAUTOENE -\definecolor{mediumblue}{RGB}{0,0,205} -\definecolor{navyblue}{RGB}{0,0,128} -\definecolor{midnightblue}{RGB}{25,25,112} -\definecolor{royalblue4}{RGB}{39,64,139} -\definecolor{blue3}{RGB}{0,0,205} - -%ROT- UND BRAUNTOENE -\definecolor{brown}{RGB}{165,42,42} %Bordaux %heller -\definecolor{brown3}{RGB}{205,51,51} %eher rot -\definecolor{brown4}{RGB}{139,35,35} %ART Bordeaux %etwas dunkler -\definecolor{red3}{RGB}{205,0,0} %bordeauxrot %noch dunkler -\definecolor{tomato}{RGB}{205,79,57} % noch dunkler aehnlich zu red3 -\definecolor{firebrick3}{RGB}{205,38,38} -\definecolor{firebrick4}{RGB}{139,26,26} - -%GELBTOENE -\definecolor{gold}{RGB}{255,215,0} -\definecolor{gold3}{RGB}{238,201,0} %dunkler - -%ORANGETOENE -\definecolor{orange}{rgb}{.9,.6,.1} -\definecolor{dunkelorange}{rgb}{.9,.5,.0} - -%Gruen -\definecolor{darkgreen}{RGB}{0,100,0} -\definecolor{green3}{RGB}{0,205,0} %dunkler als das Standartgruen -\definecolor{olivedrab}{RGB}{107,142,35} -\definecolor{forestgreen}{RGB}{34,139,34} -\definecolor{darkolivegreen}{RGB}{85,107,47} - -%Grautoene -\definecolor{grey}{rgb}{0.5,0.5,0.5} -\definecolor{dimgrey}{RGB}{105,105,105} -\definecolor{dimgrey2}{RGB}{153,153,153} -\definecolor{dimgrey3}{RGB}{181,181,181} -\definecolor{lightgrey}{RGB}{211,211,211} -\definecolor{lightergrey}{RGB}{201,201,201} -\definecolor{verylightgrey}{RGB}{222,222,222} - - -%BRAUNTOENE -\definecolor{braun}{rgb}{.6,.5,.1} -\definecolor{braun2}{rgb}{.6,.4,.1} - -%DEFINITIONEN DER SATZ- UND THEOREMUMGEBUNGEN - -%\newcommand{\<Befehlsname>}{<Definition, was hinterher im Dokument erscheinen soll>} -%"'Befehlsname"` muss %ein wirklich neuer Befehl sein -%\newcommand{\<Befehlsname>}[Anzahl der Argumente des neuen Befehls (1...9)]{#i,#(i+1)} i -%= 1...9 %Beim %Befehlsaufruf erscheint das, was man in die Argumentklammern schreibt an -%der jeweiligen Stelle #i -%Analog fuer folgenden Befehl: "<\Befehl>" muss schon existieren -%\renewcommand{\<Befehl>}{<Definition>} -%\renewcommand{\<Befehl>}[<ArgAnz>]{<Definition>} -\newcommand{\bewend}{\rule{1ex}{1ex}} -%Beweis ende: ausgefuelltes Viereck fuer das Ende eines Beweises. -\newcommand{\latop}[2]{#1 \atop #2} %gibt dem TeX-Befehl \atop eine LaTeX ueblichere Form -\newcommand{\lchoose}[2]{#1 \choose #2} -%gibt dem TeX-Befehl \choose eine LaTeX ueblichere Form - -%%%%%%%%%%%%% ZUNAECHST DIE EIGENEN STYLES %%%%%%%%%%%%% -%erst mal ein Bugfix. -%entweder -% \makeatletter -% \def\thmt@refnamewithcomma #1#2#3,#4,#5\@nil{% -% \@xa\def\csname\thmt@envname #1utorefname\endcsname{#3}% -% \ifcsname #2refname\endcsname -% \csname #2refname\expandafter\endcsname\expandafter{\thmt@envname}{#3}{#4}% -% \fi -% } -% \makeatother -%oder Zur zwischenzeitlichen Abhilfe sollte es helfen, Z.48 in thm-autoref wie folgt -%abzuaendern: \csname #2refname\@xa\endcsname\@xa{\thmt@envname}{#3}{#4}% -%Ich habe das bereits gemacht. - -%Eingener Nummerierungsstyl am Rand und grau -%Damit der Stil margincolored definiert ist muss -% \definecolor{dimgrey}{RGB}{105,105,105} -% \definecolor{dimgrey2}{RGB}{153,153,153} -% \def\thmt@headstyle@margincolored{% -% \makebox[0pt][r]{\color{dimgrey2}\NUMBER\ }\NAME\NOTE -% } - -% -% zu thm-ntheorem.sty und thm-amsthm.sty ergänzt werden. -%%%%% Definitionsstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{olivedrab}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{olivedrab}$\pmb{\triangleleft}$]{customdefintion} -%Defintion -\declaretheorem[name=Definition,numberwithin=section,style=customdefintion, -refname={Definition,Defintionen}]{df} -%Bezeichnungen -\declaretheorem[name=Bezeichnungen,sibling=df,style=customdefintion, -refname={Bezeichnungen,Bezeichnungen}]{bez} -\declaretheorem[name=Bezeichnung,sibling=df,style=customdefintion, -refname={Bezeichnung,Bezeichnungen}]{bz} -%Bezeichnungen ohne Nummer: -\declaretheorem[name=Bezeichnungen,numbered=no,style=customdefintion, -refname={Bezeichnungen,Bezeichnungen}]{bez*} - -%Festlegung mit und ohne nummer -\declaretheorem[name=Festlegung,sibling=df,style=customdefintion, -refname={Festlegungen,Festlegungen}]{festlg} -\declaretheorem[name=Festlegung,numbered=no,style=customdefintion, -refname={Festlegungen,Festlegungen}]{nnfestlg} - -%%%%% Beispiel- und Bemerkungstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber oder margin -headfont={\color{midnightblue}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\normalfont, -postheadspace=1em, -qed=\color{midnightblue}$\pmb{\triangleleft}$]{custombspbem} -%Beispiel -\declaretheorem[numberlike=df,name=Beispiel,style=custombspbem, -refname={Beispiel,Beispiele}]{bsp} -%Bemerkung -\declaretheorem[name=Bemerkung,sibling=df,style=custombspbem, -refname={Bemerkung,Bemerkungen}]{bem} - -%%%%% Lemma-,Korollarstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{tomato}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{tomato}$\pmb{\lrcorner}$]{customlemma} -%Lemma -\declaretheorem[name=Lemma,sibling=df,style=customlemma, -refname={Lemma,Lemmata}]{lm} -%Korollar -\declaretheorem[name=Korollar,sibling=df,style=customlemma, -refname={Korollar,Korollare}]{kor} - -%%%%% Notizstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{darkgreen}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{darkgreen}$\pmb{\lrcorner}$]{customnotiz} -%Notiz -\declaretheorem[name=Notiz,sibling=df,style=customnotiz, -refname={Notiz,Notizen}]{nz} -%%Spezialnotiz fuer die D-Arbeit: Prinzip der Nullstellensuche -\declaretheorem[name=Prinzip der Nullstellensuche,sibling=df,style=customnotiz, -refname={Notiz,Notizen}]{pdnss} -\declaretheorem[name=Fragestellung,sibling=df,style=customnotiz, -refname={Fragestellung,Fragestellungen}]{frage} -\declaretheorem[name=Fragestellungen,sibling=df,style=customnotiz, -refname={Fragestellungen,Fragestellungen}]{fragen} - -\declaretheorem[name=Erklärung,sibling=df,style=customnotiz, -refname={Erklärung,Erklärungen}]{erklaerung} -\declaretheorem[name=Erklärung,numbered=no,style=customnotiz, -refname={Erklärung,Erklärungen}]{erklaerung*} - - -%%%%%%%%%%%%Berechnungstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{darkgreen}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\normalfont, -postheadspace=1em, -qed=\color{darkgreen}$\pmb{\bewend}$]{customberechnung} -%Nebenrechnung -\declaretheorem[name=Nebenrechnung,sibling=df,style=customberechnung, -refname={Nebenrechnung,Nebenrechnungen}]{nr} - -%%%%% Satz-, Hauptsatz-, Satz und Definition und Propositionsstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{firebrick4}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{firebrick4}$\lrcorner$]{customsatz} -%Satz -\declaretheorem[name=Satz,sibling=df,style=customsatz, -refname={Satz,S\"atze}]{sz} -%ohne Nummer -\declaretheorem[name=Satz,numbered=no,style=customsatz, -refname={Satz,S\"atze}]{sz*} -%Hauptsatz -\declaretheorem[name=Hauptsatz,sibling=df,style=customsatz, -refname={Hauptsatz,Haupts\"atze}]{hsz} -%ohne Nummer -\declaretheorem[name=Hauptsatz,numbered=no,style=customsatz, -refname={Hauptsatz,Haupts\"atze}]{hsz*} -%Satz und Definition -\declaretheorem[name=Satz und Definition,sibling=df,style=customsatz, -refname={Satz und Definition,S\"atze und Definitionen}]{szdf} -%Proposition -\declaretheorem[sibling=df,name=Proposition,style=customsatz, -refname={Proposition,Propositionen}]{proposition} - -%%%%%%%%% Beweisumgebung -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont=\bfseries, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\normalfont, -postheadspace=1em, -qed=\bewend]{custombew} -%Satz -\declaretheorem[numbered=no,name=Beweis,style=custombew, -refname={Beweis,Beweise}]{bew} - -%%%%%%%%%%%%%%%%%%%%%%% Zitieren von Code %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%allgemeine Vorgaben fuer das Zieren von Code. - -\lstset{% -numberbychapter=true, % -breaklines=true,% -prebreak = \raisebox{0ex}[0ex][0ex]{\ensuremath{\hookleftarrow}},% -breakatwhitespace=false,% -basicstyle=\footnotesize\ttfamily,% -commentstyle=\itshape,% -fontadjust=true,% -tabsize=2,% -stringstyle=\itshape,% -numbers=left,numberstyle=\footnotesize\ttfamily,% -extendedchars=true,% -inputencoding=utf8,% -stepnumber=1,% -frame=shadowbox,% -rulesepcolor=\color{grey},% -backgroundcolor=\color{white},% -showspaces=false,% -showstringspaces=false% -aboveskip={1.5\baselineskip},% -columns=fixed,% -upquote=true,% -} -% Spezialvorgaben fuer das Zitieren von MATLAB Code. -\newcommand{\citematlab}{\lstset{language=Matlab,% -emph={if,elseif,else,end,for,while,function,return},% -emphstyle=\bfseries\color{midnightblue},emph={[2]EigMitLambda,Zerol,CotKlTan -,CotKlTanSpez,XsGrLambda,XsKlLambda,CotGrTan,ordnen,EvenSingTan,einord},% -emphstyle={[2]\bfseries\color{olivedrab}},% -emph={[3]zew,ew,l,L,lambda,ewsum,ewanz,phi,v1,v2},emphstyle={[3]\color{braun}}}} - -\crefname{lstlisting}{Listing}{Listings} -\Crefname{lstlisting}{Listing}{Listings} - -%INDEXERSTELLUNG - -%\makeindex %erstellt ein indexfile. soll man am schluss erst machen! -%\makeglossary -%\includeonly{1laag1} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - HIER BEGINNT DAS DOKUMENT - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - -\linespread{1.35} -%setzt einen anderen Zeilenabstand fest. Dieser Befehl sollte vor -%\begin{document} stehen, damit er fuer das ganze Dokument gilt. - -%%%%%%%%%%%%%%%%%%%% Ausgemusterter Code %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%Dies sind Theoremdefintionen f\"ur das ntheorem packet. -% {\theoremseparator{.} -% \theoremheaderfont{\color{olivedrab}\bfseries\scshape} -% \theoremstyle{plain} -% \newtheorem{df}{Definition}[section] } -% -% {\theoremseparator{.} -% \theoremheaderfont{\color{olivedrab}\bfseries\scshape} -% {\theoremheaderfont{\color{midnightblue}\bfseries\scshape} -% \theorembodyfont{\rmfamily} -% \theoremstyle{plain} -% \newtheorem{bem}[df]{Bemerkung} -% \newtheorem{bsp}[df]{Beispiel}} } -% -% {\theoremseparator{.} -% \theoremstyle{plain} -% {\theoremheaderfont{\color{firebrick4} \bfseries\scshape} -% \newtheorem{sz}[df]{Satz} -% \newtheorem{prop}[df]{Proposition} -% \newtheorem{szdf}[df]{Satz und Definition} -% \newtheorem{hsz}[df]{Hauptsatz}} - -%{\theoremheaderfont{\color{tomato} \bfseries\scshape} -% \newtheorem{lm}[df]{Lemma} -% \newtheorem{nz}[df]{Notiz} -% \newtheorem{nr}[df]{Nebenrechnung} -% \newtheorem{kor}[df]{Korollar}} -% } -% -% {\theoremseparator{.} -% \theoremstyle{plain} -% {\theoremheaderfont{\bfseries\scshape} -% \theorembodyfont{\rmfamily} -% \newtheorem*{bew}{Beweis}} -% } diff --git a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/L-Schema_Paper_makros.tex b/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/L-Schema_Paper_makros.tex deleted file mode 100644 index cdfeee4..0000000 --- a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/L-Schema_Paper_makros.tex +++ /dev/null @@ -1,92 +0,0 @@ - -%%% THIS FILE CONTAINS MACROS FOR THE L-SCHEME-PAPER - -\newcommand{\restric}{\,\rule[-5pt]{0.4pt}{12pt}\,{}} -\newcommand{\dom}{\Omega} -\newcommand{\union}[2]{#1 \cup \, #2} -%vector -\newcommand{\vt}[1]{\boldsymbol{#1}} -% smoothness of domain -\newcommand{\smoothness}{{Lipschitz}} -\newcommand{\addnullcolor}{black!60} -% smoothness of interfac -\newcommand{\interfacesmoothness}{{Lipschitz}} -% Domain boundaries -% outer Boundaries -\newcommand{\oB}[1]{\partial\Omega^{#1}} -%\newcommand{\OuterBoundary}{$\partial\dom\cap\partial\dom_2$} - -\newcommand{\kdiff}{k^{\text{diff}}} - -% makros for the L-scheme scheme -\newcommand{\plni}[2][l]{p_{#1}^{n,#2}} -%\newcommand{\gradplni}[2][l]{\vt{p_{#1}^{n,#2}}} -\newcommand{\Splni}[1]{S_l(p_l^{n,#1})} -\newcommand{\gradplni}[1]{\vt{\nabla p_l^{n,#1}}} -\newcommand{\gradplniMinusG}[1]{\vt{\nabla \bigl( p_l^{n,#1} - z \bigr)}} -\newcommand{\klni}[2][l]{k_#1\bigl(S_#1(p_#1^{n,#2})\bigr)} -\newcommand{\kln}[1]{k_{#1}\bigl(S_{#1}(p_{#1}^{n})\bigr)} -\newcommand{\klnnull}[1]{k_{#1}\left(S_{#1}\bigl(p_{#1}^{n-1}\bigr)\right)} -\newcommand{\gli}[2][l]{g_{#1}^{#2}} -% the same for the summed variables -\newcommand{\pni}[1][i]{p^{n,#1}} -\newcommand{\gradpni}[1][i]{\nabla p^{n,#1}} -\newcommand{\gi}[1][i]{g^{#1}} -\newcommand{\epli}[2][l]{e_{p,#1}^{#2}} -\newcommand{\epliOnGamma}[2][l]{e_{p,#1|_\Gamma}^{#2}} -\newcommand{\gradepli}[2][l]{\vt{\nabla e_{p,#1}^{#2}}} -\newcommand{\egli}[2][l]{e_{g,#1}^{#2}} -\newcommand{\flux}[2][l]{\vt{F_{#1}^{n,#2}}} -% scalar product -% normal math mode sized -\newcommand{\spl}{\bigl\langle} -\newcommand{\spr}{\bigr\rangle} -% text mode sized -\newcommand{\tspl}{\langle} -\newcommand{\tspr}{\rangle} -% bigger sized -\newcommand{\bspl}{\Bigl\langle} -\newcommand{\bspr}{\Bigr\rangle} -%norms -\newcommand{\nml}{\bigl\|} -\newcommand{\nmr}{\bigr\|} -\newcommand{\Nml}{\Bigl\|} -\newcommand{\Nmr}{\Bigr\|} - -% spaces -\newcommand{\fs}[1]{H_{\oB{#1}}^1} -\newcommand{\Fs}{\mathcal{V}} -\newcommand{\Tracespace}{H^{1/2}_{00}(\Gamma)} -\newcommand{\tGamma}{{\tilde{\Gamma}}} -\newcommand{\onGamma}[1]{{#1}_{|_\Gamma}} -\newcommand{\RR}{\mathbb{R}} -\newcommand{\RRd}{\mathbb{R}^d} -\newcommand{\NN}{\mathbb{N}} -\newcommand{\CC}{\mathbb{C}} -\newcommand{\KK}{\mathbb{K}} -\newcommand{\ZZ}{\mathbb{Z}} -\newcommand{\QQ}{\mathbb{Q}} -\newcommand{\Hr}{\mathscr{H}} -\newcommand{\Lb}{\mathcal{L}} -\newcommand{\D}{\mathcal{D}} -\newcommand{\V}{\mathcal{V}} -%\newcommand{\G}{\mathcal{G}} -\newcommand{\E}{\mathcal{E}} -\DeclareMathOperator{\Span}{Span} -\DeclareMathOperator{\vol}{vol} -\DeclareMathOperator{\re}{Re} -\DeclareMathOperator{\im}{Im} -\DeclareMathOperator{\cosinus}{cosinus} -\DeclareMathOperator{\dv}{\nabla\cdot } -\DeclareMathOperator{\supp}{supp} -\DeclareMathOperator{\dist}{dist} -\DeclareMathOperator{\length}{length} -\DeclareMathOperator{\trace}{tr} -%\DeclareMathOperator{\liminf}{lim inf} -%\DeclareMathOperator{\deg}{deg} -%\DeclareMathOperator{\max}{max} -\providecommand{\abs}[1]{\lvert#1\rvert} -\providecommand{\norm}[1]{\lVert#1\rVert} -\newcommand{\tr}[1]{\trace_{#1}} - -\newcommand{\HRule}{\rule{\linewidth}{0.5mm}} diff --git a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikel_theoreme_und_farbe.tex b/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikel_theoreme_und_farbe.tex deleted file mode 100644 index 4e7bcfd..0000000 --- a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikel_theoreme_und_farbe.tex +++ /dev/null @@ -1,383 +0,0 @@ -%FARBDEFINTIONEN -%\definecolor{dunkelblau}{rgb}{0.21,0.37,0.87}definert neue Farben. Mit rgb-Werten in % mit RGB kann man die %RGB werte driket angeben - -%BLAUTOENE -\definecolor{mediumblue}{RGB}{0,0,205} -\definecolor{navyblue}{RGB}{0,0,128} -\definecolor{midnightblue}{RGB}{25,25,112} -\definecolor{royalblue4}{RGB}{39,64,139} -\definecolor{blue3}{RGB}{0,0,205} -\definecolor{steelblue3}{RGB}{79,148,205} -\definecolor{steelblue4}{RGB}{54,100,139} - -%ROT- UND BRAUNTOENE -\definecolor{brown}{RGB}{165,42,42} %Bordaux %heller -\definecolor{brown3}{RGB}{205,51,51} %eher rot -\definecolor{brown4}{RGB}{139,35,35} %ART Bordeaux %etwas dunkler -\definecolor{red3}{RGB}{205,0,0} %bordeauxrot %noch dunkler -\definecolor{tomato}{RGB}{205,79,57} % noch dunkler aehnlich zu red3 -\definecolor{firebrick3}{RGB}{205,38,38} -\definecolor{firebrick4}{RGB}{139,26,26} - -%GELBTOENE -\definecolor{gold}{RGB}{255,215,0} -\definecolor{gold3}{RGB}{238,201,0} %dunkler -\definecolor{darkgoldenrod1}{RGB}{255,185,15} -\definecolor{goldenrod1}{RGB}{255,193,37} -\definecolor{goldenrod}{RGB}{218,165,32} - -%ORANGETOENE -\definecolor{orange}{rgb}{.9,.6,.1} -\definecolor{dunkelorange}{rgb}{.9,.5,.0} -\definecolor{orange2}{RGB}{238,154,0} -\definecolor{orange3}{RGB}{205,133,0} - -%Gruen -\definecolor{darkgreen}{RGB}{0,100,0} -\definecolor{green3}{RGB}{0,205,0} %dunkler als das Standartgruen -\definecolor{olivedrab}{RGB}{107,142,35} -\definecolor{olivedrab2}{RGB}{179,238,58} -\definecolor{olivedrab3}{RGB}{154,205,50} -\definecolor{forestgreen}{RGB}{34,139,34} -\definecolor{darkolivegreen}{RGB}{85,107,47} -\definecolor{darkolivegreen4}{RGB}{110,139,61} -\definecolor{khaki3}{RGB}{205,198,115} - -%Grautoene -\definecolor{grey}{rgb}{0.5,0.5,0.5} -\definecolor{dimgrey}{RGB}{105,105,105} -\definecolor{dimgrey2}{RGB}{153,153,153} -\definecolor{dimgrey3}{RGB}{181,181,181} -\definecolor{lightgrey}{RGB}{211,211,211} -\definecolor{lightergrey}{RGB}{201,201,201} -\definecolor{verylightgrey}{RGB}{222,222,222} - - -%BRAUNTOENE -\definecolor{braun}{rgb}{.6,.5,.1} -\definecolor{braun2}{rgb}{.6,.4,.1} -\definecolor{tan4}{RGB}{149,90,43} - -%%SCHATTIERUNGEN VON WEISS -\definecolor{wheat3}{RGB}{205,186,150} -\definecolor{wheat4}{RGB}{139,126,102} - - -%DEFINITIONEN DER SATZ- UND THEOREMUMGEBUNGEN - -%\newcommand{\<Befehlsname>}{<Definition, was hinterher im Dokument erscheinen soll>} -%"'Befehlsname"` muss %ein wirklich neuer Befehl sein -%\newcommand{\<Befehlsname>}[Anzahl der Argumente des neuen Befehls (1...9)]{#i,#(i+1)} i -%= 1...9 %Beim %Befehlsaufruf erscheint das, was man in die Argumentklammern schreibt an -%der jeweiligen Stelle #i -%Analog fuer folgenden Befehl: "<\Befehl>" muss schon existieren -%\renewcommand{\<Befehl>}{<Definition>} -%\renewcommand{\<Befehl>}[<ArgAnz>]{<Definition>} -\newcommand{\bewend}{\rule{1ex}{1ex}} -\renewcommand{\qedsymbol}{\rule{1ex}{1ex}} -%Beweis ende: ausgefuelltes Viereck fuer das Ende eines Beweises. -\newcommand{\latop}[2]{#1 \atop #2} %gibt dem TeX-Befehl \atop eine LaTeX ueblichere Form -\newcommand{\lchoose}[2]{#1 \choose #2} -%gibt dem TeX-Befehl \choose eine LaTeX ueblichere Form - -%%%%%%%%%%%%% ZUNAECHST DIE EIGENEN STYLES %%%%%%%%%%%%% -%erst mal ein Bugfix. -%entweder -% \makeatletter -% \def\thmt@refnamewithcomma #1#2#3,#4,#5\@nil{% -% \@xa\def\csname\thmt@envname #1utorefname\endcsname{#3}% -% \ifcsname #2refname\endcsname -% \csname #2refname\expandafter\endcsname\expandafter{\thmt@envname}{#3}{#4}% -% \fi -% } -% \makeatother -%oder Zur zwischenzeitlichen Abhilfe sollte es helfen, Z.48 in thm-autoref wie folgt -%abzuaendern: \csname #2refname\@xa\endcsname\@xa{\thmt@envname}{#3}{#4}% -%Dies ist in der TeXLive2014 bereits gefixt. - -%Eingener Nummerierungsstyl am Rand und grau -%Damit der Stil margincolored definiert ist muss -\makeatletter - \def\thmt@headstyle@margincolored{% - \makebox[0pt][r]{\color{black!40}\NUMBER\ }\NAME\NOTE - } -\makeatother -% in thm-ntheorem.sty und thm-amsthm.sty ergaenzt werden. Dies ist mit diesem Code erledigt ohne -%die Originalpakete zu veraendern. - -% General Numbering Style -%\def \customheadformat {margincolored} -%%% FARBDEFINTIONEN fuer theoremstyles -\newcommand{\definitionstylecolor}{black} -\newcommand{\exampleandremarkstylecolor}{black} -\newcommand{\lammacorollarystylecolor}{black} -\newcommand{\notestylecolor}{black} -\newcommand{\customtheoremstylecolor}{black} -%\newcommand{margincolored}{margin} -%%%%% Definitionsstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored,%margincolored, %auch moeglich ist swapnumber margin -headfont={\color{\definitionstylecolor}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{\definitionstylecolor}$\pmb{\triangleleft}$]{customdefintion} -%Defintion -\declaretheorem[name=Definition,numberwithin=section,style=customdefintion, -refname={Definition,Defintionen}]{df} -%Bezeichnungen -\declaretheorem[name=Bezeichnungen,sibling=df,style=customdefintion, -refname={Bezeichnungen,Bezeichnungen}]{bez} -\declaretheorem[name=Bezeichnung,sibling=df,style=customdefintion, -refname={Bezeichnung,Bezeichnungen}]{bz} -%Bezeichnungen ohne Nummer: -\declaretheorem[name=Bezeichnungen,numbered=no,style=customdefintion, -refname={Bezeichnungen,Bezeichnungen}]{bez*} -%notations -\declaretheorem[name=Notations,sibling=df,style=customdefintion, -refname={Notations,Notations}]{notations} -%notation -\declaretheorem[name=Notation,sibling=df,style=customdefintion, -refname={Notation,Notations}]{notation} -%notations without number: -\declaretheorem[name=Notations,numbered=no,style=customdefintion, -refname={Notations,Notations}]{notations*} -%Assumption -\declaretheorem[name=Assumption,sibling=df,style=customdefintion, -refname={assumption,assumptions}]{assumption} -%Assumptions -\declaretheorem[name=Assumptions,sibling=df,style=customdefintion, -refname={assumptions,assumptions}]{assumptions} - - -%Festlegung mit und ohne nummer -\declaretheorem[name=Festlegung,sibling=df,style=customdefintion, -refname={Festlegungen,Festlegungen}]{festlg} -\declaretheorem[name=Festlegung,numbered=no,style=customdefintion, -refname={Festlegungen,Festlegungen}]{nnfestlg} - -%%%%% Beispiel- und Bemerkungstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber oder margin -headfont={\color{\exampleandremarkstylecolor}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\normalfont, -postheadspace=1em, -qed=\color{\exampleandremarkstylecolor}$\pmb{\triangleleft}$]{custombspbem} -%Beispiel -\declaretheorem[numberlike=df,name=Beispiel,style=custombspbem, -refname={Beispiel,Beispiele}]{bsp} -%Bemerkung -\declaretheorem[name=Bemerkung,sibling=df,style=custombspbem, -refname={Bemerkung,Bemerkungen}]{bem} -%Example -\declaretheorem[numberlike=df,name=Example,style=custombspbem, -refname={Example,Examples}]{example} -%remark -\declaretheorem[name=Remark,sibling=df,style=custombspbem, -refname={Remark,Remarks}]{remark} -% observation -\declaretheorem[name=Observation,sibling=df,style=custombspbem, -refname={Observation,Observations}]{observation} -%%%%% Lemma-,Korollarstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{\lammacorollarystylecolor}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{\lammacorollarystylecolor}$\pmb{\lrcorner}$]{customlemma} -%Lemma -\declaretheorem[name=Lemma,sibling=df,style=customlemma, -refname={Lemma,Lemmata}]{lemma} -%Korollar -\declaretheorem[name=Korollar,sibling=df,style=customlemma, -refname={Korollar,Korollare}]{kor} -%Corollay -\declaretheorem[name=Corollary,sibling=df,style=customlemma, -refname={Corollary,Corollaries}]{corollary} -%Conclusion -\declaretheorem[name=Conclusion,sibling=df,style=customlemma, -refname={Conclusion,Conclusions}]{conclusion} - - - -%%%%% Notizstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored,%margincolored, %auch moeglich ist swapnumber margin -headfont={\color{\notestylecolor}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{\notestylecolor}$\pmb{\lrcorner}$]{customnotiz} -%Notiz -\declaretheorem[name=Notiz,sibling=df,style=customnotiz, -refname={Notiz,Notizen}]{notiz} -%%Spezialnotiz fuer die D-Arbeit: Prinzip der Nullstellensuche -\declaretheorem[name=Prinzip der Nullstellensuche,sibling=df,style=customnotiz, -refname={Notiz,Notizen}]{pdnss} -\declaretheorem[name=Fragestellung,sibling=df,style=customnotiz, -refname={Fragestellung,Fragestellungen}]{frage} -\declaretheorem[name=Fragestellungen,sibling=df,style=customnotiz, -refname={Fragestellungen,Fragestellungen}]{fragen} -%Idea environment -\declaretheorem[name=Idea,sibling=df,style=customnotiz, -refname={idea,ideas}]{idea} -%Main Idea environment -\declaretheorem[name=Main idea,sibling=df,style=customnotiz, -refname={main idea,main ideas}]{mainidea} -%General Idea environment -\declaretheorem[name=General idea,sibling=df,style=customnotiz, -refname={general idea,general ideas}]{generalidea} -%Questions and Tasks -\declaretheorem[name=Questions and Tasks,sibling=df,style=customnotiz, -refname={questions and tasks,question and tasks}]{QuestTasks} -%Problem -\declaretheorem[name=Problem,sibling=df,style=customnotiz, -refname={problem,problems}]{problem} -\declaretheorem[name=Problem,numbered=no,style=customnotiz, -refname={problem,problems}]{problem*} -% Note -\declaretheorem[name=Note,sibling=df,style=customnotiz, -refname={Note,Notes}]{note} - - - -\declaretheorem[name=Erklärung,sibling=df,style=customnotiz, -refname={Erklärung,Erklärungen}]{erklaerung} -\declaretheorem[name=Erklärung,numbered=no,style=customnotiz, -refname={Erklärung,Erklärungen}]{erklaerung*} - - -%%%%%%%%%%%%Berechnungstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{darkgreen}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\normalfont, -postheadspace=1em, -qed=\color{darkgreen}$\pmb{\bewend}$]{customberechnung} -%Nebenrechnung -\declaretheorem[name=Nebenrechnung,sibling=df,style=customberechnung, -refname={Nebenrechnung,Nebenrechnungen}]{nr} - -%%%%% Satz-, Hauptsatz-, Satz und Definition und Propositionsstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored,%margincolored, %auch moeglich ist swapnumber margin -headfont={\color{\customtheoremstylecolor}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{\customtheoremstylecolor}$\lrcorner$]{customsatz} -%Satz -\declaretheorem[name=Satz,sibling=df,style=customsatz, -refname={Satz,S\"atze}]{satz} -%ohne Nummer -\declaretheorem[name=Satz,numbered=no,style=customsatz, -refname={Satz,S\"atze}]{satz*} -%Hauptsatz -\declaretheorem[name=Hauptsatz,sibling=df,style=customsatz, -refname={Hauptsatz,Haupts\"atze}]{hauptsatz} -%ohne Nummer -\declaretheorem[name=Hauptsatz,numbered=no,style=customsatz, -refname={Hauptsatz,Haupts\"atze}]{hauptsatz*} -%Satz und Definition -\declaretheorem[name=Satz und Definition,sibling=df,style=customsatz, -refname={Satz und Definition,S\"atze und Definitionen}]{satzunddefiniton} -%Proposition -\declaretheorem[sibling=df,name=Proposition,style=customsatz, -refname={Proposition,Propositionen}]{proposition} -% English -%theorem -\declaretheorem[name=Theorem,sibling=df,style=customsatz, -refname={Theorem,Theorems}]{satzengl} -%ohne Nummer -\declaretheorem[name=Theorem,numbered=no,style=customsatz, -refname={Theorem,Theorems}]{satzengl*} -%Satz und Definition -\declaretheorem[name=Theorem and Definition,sibling=df,style=customsatz, -refname={Theorem and Definition,Theorems and Definitions}]{thmdf} -%Proposition -\declaretheorem[sibling=df,name=Proposition,style=customsatz, -refname={Proposition,Propositions}]{prop} - - -%%%%%%%%% Beweisumgebung -%\newcommand{\customtheoremstylecolor}{black} -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored,%margincolored, %auch moeglich ist swapnumber margin -headfont=\bfseries, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\normalfont, -postheadspace=1em, -qed=\bewend]{custombew} -%Beweis -\declaretheorem[numbered=no,name=Beweis,style=custombew, -refname={Beweis,Beweise}]{Beweis} -%1 -\declaretheorem[numbered=no,name=Proof,style=custombew,% -refname={Proof,Proofs}]{Proof} - -%%% helps cleverref to use the correct capitalization -\crefname{lstlisting}{listing}{listings} -\Crefname{lstlisting}{Listing}{Listings} -\crefname{problem}{problem}{problems} -\Crefname{problem}{Problem}{Problems} -\crefname{notation}{notation}{notations} -\Crefname{notation}{Notation}{Notations} -\crefname{lm}{lemma}{lemmata} -\Crefname{lm}{Lemma}{Lemmata} -\crefname{assumptions}{assumptions}{assumptions} -\Crefname{assumptions}{Assumptions}{Assumptions} -\crefname{satzengl}{theorem}{theorems} -\Crefname{satzengl}{Theorem}{Theorems} -\crefname{satzengl*}{theorem}{theorems} -\Crefname{satzengl*}{Theorem}{Theorems} -\crefname{cor}{corollary}{corollaries} -\Crefname{cor}{Corollary}{Corollaries} -\crefname{df}{defintion}{defintions} -\Crefname{df}{Defintion}{Defintions} -\crefname{remark}{remark}{remarks} -\Crefname{remark}{Remark}{Remarks} -\crefname{observation}{observation}{observations} -\Crefname{observation}{Observation}{Observations} -%%%%%%%%%%%%%%%%%%%%%%% Zitieren von Code %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%allgemeine Vorgaben fuer das Zieren von Code. -% -% \lstset{% -% numberbychapter=true, % -% breaklines=true,% -% prebreak = \raisebox{0ex}[0ex][0ex]{\ensuremath{\hookleftarrow}},% -% breakatwhitespace=false,% -% basicstyle=\footnotesize\ttfamily,% -% commentstyle=\itshape,% -% fontadjust=true,% -% tabsize=2,% -% stringstyle=\itshape,% -% numbers=left,numberstyle=\footnotesize\ttfamily,% -% extendedchars=true,% -% inputencoding=utf8,% -% stepnumber=1,% -% frame=shadowbox,% -% rulesepcolor=\color{grey},% -% backgroundcolor=\color{white},% -% showspaces=false,% -% showstringspaces=false% -% aboveskip={1.5\baselineskip},% -% columns=fixed,% -% upquote=true,% -% } -% % Spezialvorgaben fuer das Zitieren von MATLAB Code. -% \newcommand{\citematlab}{\lstset{language=Matlab,% -% emph={if,elseif,else,end,for,while,function,return},% -% emphstyle=\bfseries\color{midnightblue},emph={[2]EigMitLambda,Zerol,CotKlTan -% ,CotKlTanSpez,XsGrLambda,XsKlLambda,CotGrTan,ordnen,EvenSingTan,einord},% -% emphstyle={[2]\bfseries\color{olivedrab}},% -% emph={[3]zew,ew,l,L,lambda,ewsum,ewanz,phi,v1,v2},emphstyle={[3]\color{braun}}}} diff --git a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikelpraeambel.tex b/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikelpraeambel.tex deleted file mode 100644 index a72947c..0000000 --- a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikelpraeambel.tex +++ /dev/null @@ -1,452 +0,0 @@ -%Dies ist der Kopf meiner Skripte. Er enthaelt alle Pakete und Einstellungen - -%%% BUG FIXING SECTION -% There ist a bug in thmtools. After Latex Upgrade change line 48 in thm-autoref.sty so that -% it reads -%\csname #2refname\@xa\endcsname\@xa{\thmt@envname}{#3}{#4}% -% then run texhash - -%MAKROPAKETE -%1.PAKETE DIE MIT DER KODIERUNG VON ZEICHEN ZU TUN HABEN. -%\usepackage[german]{babel} -%Definition von Sprachabhaengigen Komponenten insbesondere fuer Dokumente -%in anderen Sprachen als Englisch -%\usepackage{fixltx2e} -\usepackage{etex} %some fix for hyperref -%Korrektur einiger Fehler die sich in LaTeX2e eingeschlichen haben. -%\usepackage{ngerman} -% stellt Sonderzeichen und ihre Befehle wie zum Beispiel "o zur Verfuegung - -%%%%%%%%%%%% SCHRIFTEN %%%%%%%%%%%%%%%%%%%%%%%% -%\usepackage{mathpazo}%andere Schriftart -%\usepackage{lmodern} -%\usepackage{beramono} -% Using Courier font -\renewcommand{\ttdefault}{pcr} -%Tweak, damit auch im Mathemodus tt-schrift fettgedruckt werden kann. -\usepackage{ifluatex} -%%%% PDFLaTeX or LUALaTeX %%%%%%% -\ifluatex - %\usepackage{luatextra} - \usepackage{lualatex-math} -% \usepackage{unicode-math} -% \setmathfont{xits-math.otf} -\else - %% if pdflatex is used uncomment the following packages. If lualatex is used comment them. - %dieses Paket ermoeglicht die Eingabe von Sonderzeichen ueber die Tastatur - \usepackage[utf8]{inputenx} - %additions for utf8 - \input{ix-utf8enc.dfu} - %% comment \usepackage{uiinput} if lulatex is used! line 131 - %% if pdflatex is used uncomment above packages. If lualatex is used comment them. -\fi -\usepackage{microtype} -\usepackage[dvipsnames,svgnames,table]{xcolor} % Farben - -\usepackage[T1]{fontenc} %Kodierung von Zeichensaetzen. - %Das optionale Argument <Kodierung> kann eine durch Komma getrennte Liste von -%Kodierungen enthalten. Im Text koennte dann an %beliebiger %Stelle zum wechseln der -%Kodierung die Befehlsfolge: - %\fontencoding{<Kodierung>} - %\selectfont - %verwendet werden. Gaengige Kodierungen sind: -% Tabelle 5.4: Kodierungen -% T1 8-Bit-Standard fuer EC-Fonts -% TS 8-Bit-Zeichenkodierung fuer TS-Fonts -% OT1 7-Bit-Kodierung fuer Text1 , CM-Fonts -% OML 7-Bit-Kodierung fuer Formeltext1 -% OMS 7-Bit-Kodierung fuer mathematische Symbole1 -% OMX 7-Bit-Kodierung fuer erweiterte mathematische Symbole1 -\usepackage{latexsym} -%Definiert zusaetzliche Symbolbefehle. -\usepackage[full]{textcomp} -% Sammlung von Textsymbolen. Optional kann [safe] oder [full] -% als Option hinzugefuegt werden, lezteres aber nur bei -%CM und EC-Fonts - -% einige mathesymbole wie \lbrack -\usepackage{stmaryrd} -\usepackage{eucal} -%Stellt deutsche Frakturschrift im Math Modus zur Verfuegung bei \mathcal -%\usepackage{sistyle,upgreek} -%\usepackage{fixmath} -% sistyle stellt \SI{Masszahl}{Einheit} -% bereit, zur si-konformen Darstellung von phy Goessen. textcom und upgreek stellt -% fweiter Symbole bereit, welche sistyle braucht. Ausserdem diese Befehle \micro, -% \ohm, \SIdecimalsign{,}(legt die trennung bei Dezimalzahlen fest) -% \SIproductsign{\cdot} (legt das Multiplikationszeichen fest) \SIgroupfourfalse -% erzeugt bei grossen Zahlen kleine Abstaende zwischen 3ergruppen \ang{zahl} ist das -% gradzeichen. -\usepackage{mathrsfs} %Stellt schreibschrift zur verfuegung im Mathemoduns mit \mathscr - -%1.01 LAYOUTPAKETE -\usepackage[left = 2.5 cm, right = 2.5 cm, top = 2.5 cm, bottom = 3cm]{geometry} %a4paper -% left = 3.5 cm, right = 3.5 cm, top = 3.3 cm, bottom = 6.6cm -%\usepackage{fancyhdr}%Wird fuer erweiterte Kopf- und Fusszeileneinstellungen benoetigt. - -%\usepackage{enumerate}%Stellt die freie Auswahl von Aufzaehlungszeichen zur Verfuegung -\usepackage[shortlabels]{enumitem} %Anpassbare Enumerates/Itemizes mit [label=] - %shortlabels: komp. zu enumerate -%Packete zur benutzung des KOMA-Paketes fuer europaeische Layouts also zur -%Benutzung von 'scrartcl' fuer Artikel, 'scrreprt' fuer umfangreiche %Artikel und -%Artikelsammlungen, 'scrbook' fuer Buecher und %'scrlettr2' fuer Briefe: -%\usepackage{scrpage2} %fuer Kopf- und Fusszeilen, -%\usepackage{scrdate,scrtime}% fuer Wochentag und Uhrzeit, -%\usepackage{scraddr} -%zur Loesung von Problemen mit Paketabhaengigkeiten scrfile sowie fuer -%Briefadressverwaltung scraddr. - -%%%% neue Befehle -%Zahlensymbole - -%1.1PAKETE NOTWENDIG FUER MATHEMATISCHE FORMELN -\usepackage{amsfonts}%Fonts = Schriftarten der American mathematical Society (ams) -\usepackage{amssymb}%Mathematische Symbole der ams. -\usepackage{bbm} -\usepackage{amsmath} -% \ifluatex -% \usepackage{unicode-math} -% \else -% -% \fi - -%Definiert viele weitere Befehle fuer mathematischen Formeln und darueber hinaus. -\usepackage{exscale} -% Skaliert mathematische Symbole in anderen Schriftarten als ‚cmex10‘, so dass -% falls die Schriftart in anderen Groessen als 10pt vorliegt diese angepasst -% werden koennen -\usepackage{amstext} -% erlaubt es in abgesetzten Gleichungen mit \text kurzen Text einzufuegen. -%\usepackage{amsextra}%hauptsaechlich fuer die Kompatibilitaet von Dokumenten -%gebraucht. -%\usepackage[arrow,matrix,curve]{xy} -% Packet xy-pic um Kommutative Diagramme und -% zweidim Zeichnungen zu %zeichnen.in den eckigen Klammern stehen Module die -% geladen werden, je nach dem was man braucht. In der %Matheumgebung wird das so -% benutzt: \begin{xy} ...\end{xy} - -%Theoremumgebungen -\usepackage{amsthm}%Ermoeglicht kontrolle ueber die Theorem-Umgebung beisst -%sich mit ntheorem funktioniert aber mit \usepackage{thmtools} -\usepackage{thm-patch,aliasctr,parseargs,keyval} -\usepackage{thmtools} - -%stellt \declaretheorem[style=definition,qed=$\rtimes$]{definition} -%zur verfuegung -% There ist a bug in thmtools. After Latex Upgrade change line 48 in thm-autoref.sty so that -% it reads -% \csname #2refname\@xa\endcsname\@xa{\thmt@envname}{#3}{#4}% -% then run texhash - -%Erlaubt das Setzen fetter Symbole mit \boldymbol{} bzw\pmb{} -\usepackage{bm} -\usepackage{amsbsy} -% stellt die Befehle \bm \hm zur Verfuegung, um mathematische -% Symbole fett zu machen. Muss nach allen Fontpacketen geladen %werden!!! - -\ifluatex - %\usepackage{unicode-math} -\else - % if LUALaTeX is used uncomment this - %\usepackage{uniinput} %ermoeglicht die Eingabe von unicode Zeichen -\fi - -%\usepackage{listings} -%Wird verwendet um sourcecode zu TeXen, stellt -%\begin{lstlisting} .. \end{lstlisting} und \lstinputlisting zur Verfuegung - - -%2.PAKETE FUER GRAFIKEN UND GLEITOBJEKTE -\usepackage{float,scrhack} -%Stellt zusaetzliche Befehle fuer Gleitobjekte zur Verfuegung -\usepackage{wrapfig} -%Stellt die Moeglichkeit zur Verfuegung Text um Bilder herumlaufen zu lassen. -\usepackage[textfont=it,labelfont=bf,format=plain]{caption} -% Ermoeglicht das einstellen von figureumgebungen -\usepackage{subcaption} - -\usepackage{array}%Verbessert die Darstellung von Tabellen und stellt erweiterte Befehle -%zur Verfuegung. -\usepackage{hhline} %stellt den \hhline in Tabellen zur Verfuegung -\usepackage{delarray} -%stellt eine einfachere Umgebung fuer begrenzte Arrays zur -%Verfuegung.\begin{array} LB {<Spaltenvereinbarung>} RB - -% das tabu Packet, ein machtiges Tabellenpaket -\usepackage{tabu} -\usepackage{colortbl} % Farben in Tabellenzeilen - -%\usepackage{flafter} %Verhindert, dass Gleitobjekte in einem Dokument vor die -%Stelle gesetzt werden, an der sie in der Eingabedatei %aufgebaut werden. -%\usepackage{graphpap}%Zum Setzen von „Millimeter“-Papier. Es definiert den -%graphics paper-Befehl in der picture-Umgebung. - -%\usepackage[]{graphicx} %vorsicht, laedt hyperref -%\usepackage{sidecap} -%Für das malen von Graphen -%Für das malen von Grafiken -% waehle zunaechst das richtige Treiberbackend fuer Tikz. -% beamer erkennt z. T nicht das richtige backend. pgfsys-pdf.def ist die Option, die am meisten unterstuetzt. -%Für das malen von Graphen -\usepackage{tikz} -\usepackage{pgfplots} -\pgfplotsset{compat=newest,% -% width=0.49\textwidth% - every axis plot post/.append style={ - every mark/.append style={scale=0.8,solid}, - } -} -\usetikzlibrary{arrows,% - arrows.meta,% - petri,% - topaths,% - fit,% - positioning,% - decorations.pathmorphing,% - backgrounds, - calc,% -}% - -% Ausgabe von Grafiken als externe Grafik -\usetikzlibrary{external} -\usepgfplotslibrary{external} -%\tikzset{external/optimize=true}% -%% tikzset von Jim -\tikzset{external/system call={lualatex \tikzexternalcheckshellescape --shell-escape -halt-on-error --interaction=batchmode -jobname "\image" "\texsource"}} - -%%%%%%% convert externalized tikzgraphics to png -%optional png setup -\tikzset{ - png export/.style={ - external/system call=% - {lualatex \tikzexternalcheckshellescape --shell-escape -halt-on-error -interaction=batchmode -jobname -"\image" "\texsource" && % - convert -density 300 "\image.pdf" "\image.png"}, - } -} - -\tikzset{% - % Add size information to the .dpth file (png is in density not size) - /pgf/images/external info, - % Use the png export AND the import - use png/.style={png export,png import}, - png import/.code={% - \tikzset{% - /pgf/images/include external/.code={% - % Here you can alter to whatever you want - % \pgfexternalwidth is only available if /pgf/images/external info - % is set - \includegraphics% - [width=\pgfexternalwidth,height=\pgfexternalheight]% - {{##1}.png}% - }% - }% - }% -} - -% dann kann man das mit -\tikzset{png export} -% \tikzset{use png} -% im dokument aktivieren. -%%%%%%% END convert externalized tikzgraphics to png %%%%%%%%%%%%%%%%%%% - -% \tikzset{external/system call= {pdflatex -enable-write18 -shell-escape % -% % % -save-size=80000 % -% % % -pool-size=100000000 % -% % % -extra-mem-top=500000000 % -% % % -extra-mem-bot=100000000 % -% % % -main-memory=900000000 % -% \tikzexternalcheckshellescape % -% -halt-on-error % -% -interaction=batchmode % -% -jobname "\image" "\texsource"}} -\tikzexternalize[% -% %mode=graphics if exists, - up to date check=md5, - figure list=true, - prefix=Tikzcache/,% - ] -\tikzifexternalizing{% -% don’t include package XYZ here -}{% -%hier kommen Pakete hinzu, die Probleme mit der external library von tikz haben -\usepackage{pdfpages} -%\usepackage{vmargin} -% this package is incompatible with tikz externalization and is problematic -%\usepackage[textsize=normal,textwidth=2cm,obeyFinal]{todonotes} -% %obeyDraft lässt die Notes erscheinen, wenn man draft an hat und nicht, wenn nicht. Vertraegt sich nicht mit hyperref -% % % additional todo stuff -% % % extra functionality for todonotes taken from the manual -% % % usage: \mycomment[HSM]{Testing second time.}. -% \newcounter{mycomment} -% \newcommand{\mycomment}[2][]{% -% % initials of the author (optional) + note in the margin -% \refstepcounter{mycomment}% -% {% -% \setstretch{0.7}% spacing -% \todo[color={red!100!green!33},size=\small]{% -% \textbf{Comment [\uppercase{#1}\themycomment]:}~#2}% -% }} -% % -% % mark whole section -% \newcommand\todoin[2][]{\todo[color={green},inline, caption={2do}, #1]{ -% \begin{minipage}{\textwidth-4pt}#2\end{minipage}}} -% % This example renders like -% % \todoin{ -% % Some text. -% % \begin{align} -% % \sin(\theta)^2 + \cos(\theta)^2 = 1 -% % \end{align} -% % A formula and a list -% % \begin{itemize} -% % \item An item -% % \end{itemize} -% % } -% % -% % numbered todonotes -% \newcommand{\ntodo}[2][]{\todo[#1]{\thesubsection{}. #2}} -% % combining everything -% \newcounter{todoListItems} -% \newcommand{\sstodo}[2][] -% {\addtocounter{todoListItems}{1} -% \todo[caption={\protect\hypertarget{todo\thetodoListItems}{}\thesection. #2}, #1] -% {\begin{spacing}{1} \hfill \hyperlink{todo\thetodoListItems}{#2} \end{spacing} }} -}% - - -%\usepackage[position=top]{subfig} -% % BIBLIOGRAPHIE -% \usepackage[ -% backend=biber, -% % bibliographystyle=alphabetic, -% style=nature, %globaler Style (Zitier- und Bibstil) -% citestyle=numeric, % Zitierstil -% % % % bibliographystyle=chem-acs, % Bibliographiestil -% % firstinits=true, % Vornamen abruerzen -% % sorting=nty, %sort by name,title,year -% % maxbibnames=99, -% % % maxnames=99, -% % language=british, -% % % abbreviate=true, -% doi=false, -% % isbn=false, -% url=false, -% sortcites=true, -% backref=true, -% defernumbers=true, -% ]{biblatex} -% \addbibresource{articlebibliography.bib} -% - -%3.PAKETE, DIE DAS ERSTELLEN EINES INDEX ERLEICHTERN -%\usepackage{makeidx} -%'makeidx' Stellt Befehle fuer Indexerstellung zur Verfuegung. -%\usepackage{showidx}%'showidx'bewirkt die Anzeige von Indexeintraegen %im -%Randbereich. - -%3.SONSTIGE NUETZLICHE PAKETE -%\usepackage{ifthen}%Definiert einfache Strukturen der Programmiersprachen -\usepackage{verbatim} -%\usepackage{alltt} % verbatim-Umgebung mit Interpretation von Befehlen. -%Analysepaket zur ueberpruefung der Korrektheit der Syntax bei unterdrueckter -%Ausgabe: -%\usepackage{syntonly}% stellt dem Anwender den Befehl '\syntaxonly'zur Verfuegung, -%der in der Praeambel angegeben werden muss, um beim -%Formatieren die Ausgabe zu unterdruecken; eine bereits vorhandene .dvi-Datei -%bleibt also erhalten. - - -%%%% REFERENZIERUNG %%%%% -% Die Reihenfolge der folgenden 4 Packete ist wichtig. -\usepackage{nameref} -\usepackage[english]{varioref}%Stellt erweiterte Befehle zur Referenzierung von -%Gleitobjekten zur Verfuegung -\usepackage{hyperref} -\hypersetup{ -% pdfpagelabels=true, % set pdf page lables -% naturalnames=true, % use \Latex-computed names for links -% bookmarks=true, % show bookmarks bar? - unicode=true, % non-Latin characters in Acrobat’s bookmarks -% pdftoolbar=true, % show Acrobat’s toolbar? -% pdfmenubar=true, % show Acrobat’s menu? -% pdffitwindow=false, % window fit to page when opened -% pdfstartview={FitH}, % fits the width of the page to the window -% pdftitle={My title}, % title -% pdfauthor={Author}, % author -% pdfsubject={Subject}, % subject of the document -% pdfcreator={Creator}, % creator of the document -% pdfproducer={Producer}, % producer of the document -% pdfkeywords={keyword1, key2, key3}, % list of keywords -% pdfnewwindow=true, % links in new PDF window - plainpages=false, % do page number anchors as plain arabic -% colorlinks=false, % false: boxed links; true: colored links -% hidelinks=true, -% hyperfigures=true, - linkcolor=blue, % color of internal links (change box color with linkbordercolor) - citecolor=darkgreen, % color of links to bibliography - filecolor=black, % color of file links - urlcolor=blue % color of external links - pdfborder={0 0 1}, % width of pdf link border 0 0 1, 0 0 0 = colorlinks - linkbordercolor=gray!15, - citebordercolor=green!15, -} -% Old hyperref options -%[citecolor=black,urlcolor=blue,linkcolor=blue,colorlinks=true,pdfborder={0 0 % -%0},pdfpagelabels,plainpages=false,naturalnames,unicode] -\usepackage{memhfixc} -%\usepackage[ngerman,capitalize]{cleveref} -\usepackage[capitalize]{cleveref} - -\usepackage{bookmark} -% Fix fuer das referenzieren von figures -%\usepackage[all]{hypcap} - - -%SEITENEINSTELLUNGEN -\setlength{\parindent}{0cm} %Hebt die Einrueckung von Absaetzen auf. -\linespread{1.35} -%\setlength{\textwidth}{14.5cm} %Legt die Textbreite fest -\pagestyle{myheadings} -%\usepackage{titlepage} - -%'plain' wuerde den Seitenkopf leer lassen aber die Seiten unten -%mittig durchnummerieren. 'empty' laesst die Seite komplett leer -%\markright{\today\hfill} -%\usepackage{changepage} -\allowdisplaybreaks[1] %Erlaubt bei der Align-Umgebung dass Zeilen auf -%verschiedene Seiten gesetzt werden. die zahlen 1-4 koennen angegeben werden um -%das Umbrechen noch weiter zu forcieren. - -%\pagestyle{fancy} \fancyhf{} -%\renewcommand{\headrulewidth}{0.4 pt}%Strichdicke -%\setlength{\headheight}{1.2 cm}%Hoehe der Kopfzeile - -%\fancyhead[EL]{\page} -%\fancyhead[ER]{\textsc{\rightmark}} -%\fancyhead[C]{{\Large \textbf{FK019 freier Fall, g-Leiter}}\\\small 24.10.2008} -%\fancyhead[OR]{\page} -%\fancyhead[OL]{\textsc{\rightmark}} - -%% todo makros - -% self made todo solution -\newcommand{\todo}[1]{\marginpar{\textcolor{red}{[\textbf{TODO:} #1]}}} -\newcommand{\todox}[1]{\textcolor{red}{[\textbf{TODO:} #1]}} - -%INDEXERSTELLUNG - -%\makeindex %erstellt ein indexfile. soll man am schluss erst machen! -%\makeglossary -%\includeonly{1laag1} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - HIER BEGINNT DAS DOKUMENT - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - diff --git a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/lualatexartikelpraeambel.tex b/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/lualatexartikelpraeambel.tex deleted file mode 100644 index 7955fee..0000000 --- a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/lualatexartikelpraeambel.tex +++ /dev/null @@ -1,340 +0,0 @@ -%Dies ist der Kopf meiner Skripte. Er enthaelt alle Pakete und Einstellungen - -%%% BUG FIXING SECTION -% There ist a bug in thmtools. After Latex Upgrade change line 48 in thm-autoref.sty so that -% it reads -%\csname #2refname\@xa\endcsname\@xa{\thmt@envname}{#3}{#4}% -% then run texhash - -%MAKROPAKETE -%1.PAKETE DIE MIT DER KODIERUNG VON ZEICHEN ZU TUN HABEN. -%\usepackage[german]{babel} -%Definition von Sprachabhaengigen Komponenten insbesondere fuer Dokumente -%in anderen Sprachen als Englisch -\usepackage{fixltx2e} -\usepackage{etex} %some fix for hyperref -%Korrektur einiger Fehler die sich in LaTeX2e eingeschlichen haben. -%\usepackage{ngerman} -% stellt Sonderzeichen und ihre Befehle wie zum Beispiel "o zur Verfuegung - -%%%%%%%%%%%% SCHRIFTEN %%%%%%%%%%%%%%%%%%%%%%%% -%\usepackage{mathpazo}%andere Schriftart -%\usepackage{lmodern} -%\usepackage{beramono} -% Using Courier font -\renewcommand{\ttdefault}{pcr} -%Tweak, damit auch im Mathemodus tt-schrift fettgedruckt werden kann. - -%%%% PDFLaTeX or LUALaTeX %%%%%%% -%% if pdflatex is used uncomment the following packages. If lualatex is used comment them. -%dieses Paket ermoeglicht die Eingabe von Sonderzeichen ueber die Tastatur -% \usepackage[utf8]{inputenx} -% %additions for utf8 -% \input{ix-utf8enc.dfu} -%% comment \usepackage{uiinput} if lulatex is used! line 131 -%% if pdflatex is used uncomment above packages. If lualatex is used comment them. -\usepackage{microtype} -\usepackage[dvipsnames,svgnames,table]{xcolor} % Farben - -\usepackage[T1]{fontenc} %Kodierung von Zeichensaetzen. - %Das optionale Argument <Kodierung> kann eine durch Komma getrennte Liste von -%Kodierungen enthalten. Im Text koennte dann an %beliebiger %Stelle zum wechseln der -%Kodierung die Befehlsfolge: - %\fontencoding{<Kodierung>} - %\selectfont - %verwendet werden. Gaengige Kodierungen sind: -% Tabelle 5.4: Kodierungen -% T1 8-Bit-Standard fuer EC-Fonts -% TS 8-Bit-Zeichenkodierung fuer TS-Fonts -% OT1 7-Bit-Kodierung fuer Text1 , CM-Fonts -% OML 7-Bit-Kodierung fuer Formeltext1 -% OMS 7-Bit-Kodierung fuer mathematische Symbole1 -% OMX 7-Bit-Kodierung fuer erweiterte mathematische Symbole1 -\usepackage{latexsym} -%Definiert zusaetzliche Symbolbefehle. -\usepackage[full]{textcomp} -% Sammlung von Textsymbolen. Optional kann [safe] oder [full] -% als Option hinzugefuegt werden, lezteres aber nur bei -%CM und EC-Fonts - -\usepackage{eucal} -%Stellt deutsche Frakturschrift im Math Modus zur Verfuegung bei \mathcal -%\usepackage{sistyle,upgreek} -%\usepackage{fixmath} -% sistyle stellt \SI{Masszahl}{Einheit} -% bereit, zur si-konformen Darstellung von phy Goessen. textcom und upgreek stellt -% fweiter Symbole bereit, welche sistyle braucht. Ausserdem diese Befehle \micro, -% \ohm, \SIdecimalsign{,}(legt die trennung bei Dezimalzahlen fest) -% \SIproductsign{\cdot} (legt das Multiplikationszeichen fest) \SIgroupfourfalse -% erzeugt bei grossen Zahlen kleine Abstaende zwischen 3ergruppen \ang{zahl} ist das -% gradzeichen. -\usepackage{mathrsfs} %Stellt schreibschrift zur verfuegung im Mathemoduns mit \mathscr - -%1.01 LAYOUTPAKETE -\usepackage[left = 2.5 cm, right = 2.5 cm, top = 2.5 cm, bottom = 3cm]{geometry} %a4paper -% left = 3.5 cm, right = 3.5 cm, top = 3.3 cm, bottom = 6.6cm -%\usepackage{fancyhdr}%Wird fuer erweiterte Kopf- und Fusszeileneinstellungen benoetigt. - -%\usepackage{enumerate}%Stellt die freie Auswahl von Aufzaehlungszeichen zur Verfuegung -\usepackage[shortlabels]{enumitem} %Anpassbare Enumerates/Itemizes mit [label=] - %shortlabels: komp. zu enumerate -%Packete zur benutzung des KOMA-Paketes fuer europaeische Layouts also zur -%Benutzung von 'scrartcl' fuer Artikel, 'scrreprt' fuer umfangreiche %Artikel und -%Artikelsammlungen, 'scrbook' fuer Buecher und %'scrlettr2' fuer Briefe: -%\usepackage{scrpage2} %fuer Kopf- und Fusszeilen, -%\usepackage{scrdate,scrtime}% fuer Wochentag und Uhrzeit, -%\usepackage{scraddr} -%zur Loesung von Problemen mit Paketabhaengigkeiten scrfile sowie fuer -%Briefadressverwaltung scraddr. - -%%%% neue Befehle -%Zahlensymbole - -%1.1PAKETE NOTWENDIG FUER MATHEMATISCHE FORMELN -\usepackage{amsfonts}%Fonts = Schriftarten der American mathematical Society (ams) -\usepackage{amssymb}%Mathematische Symbole der ams. -\usepackage{bbm} -\usepackage{amsmath} -%Definiert viele weitere Befehle fuer mathematischen Formeln und darueber hinaus. -\usepackage{exscale} -% Skaliert mathematische Symbole in anderen Schriftarten als ‚cmex10‘, so dass -% falls die Schriftart in anderen Groessen als 10pt vorliegt diese angepasst -% werden koennen -\usepackage{amstext} -% erlaubt es in abgesetzten Gleichungen mit \text kurzen Text einzufuegen. -%\usepackage{amsextra}%hauptsaechlich fuer die Kompatibilitaet von Dokumenten -%gebraucht. -%\usepackage[arrow,matrix,curve]{xy} -% Packet xy-pic um Kommutative Diagramme und -% zweidim Zeichnungen zu %zeichnen.in den eckigen Klammern stehen Module die -% geladen werden, je nach dem was man braucht. In der %Matheumgebung wird das so -% benutzt: \begin{xy} ...\end{xy} - -%Theoremumgebungen -\usepackage{amsthm}%Ermoeglicht kontrolle ueber die Theorem-Umgebung beisst -%sich mit ntheorem funktioniert aber mit \usepackage{thmtools} -\usepackage{thm-patch,aliasctr,parseargs,keyval} -\usepackage{thmtools} -%stellt \declaretheorem[style=definition,qed=$\rtimes$]{definition} -%zur verfuegung -% There ist a bug in thmtools. After Latex Upgrade change line 48 in thm-autoref.sty so that -% it reads -% \csname #2refname\@xa\endcsname\@xa{\thmt@envname}{#3}{#4}% -% then run texhash - -%Erlaubt das Setzen fetter Symbole mit \boldymbol{} bzw\pmb{} -\usepackage{bm} -\usepackage{amsbsy} -% stellt die Befehle \bm \hm zur Verfuegung, um mathematische -% Symbole fett zu machen. Muss nach allen Fontpacketen geladen %werden!!! - -% if LUALaTeX is used uncomment this -%\usepackage{uniinput} %ermoeglicht die Eingabe von unicode Zeichen - - -%\usepackage{listings} -%Wird verwendet um sourcecode zu TeXen, stellt -%\begin{lstlisting} .. \end{lstlisting} und \lstinputlisting zur Verfuegung - - -%2.PAKETE FUER GRAFIKEN UND GLEITOBJEKTE -\usepackage{float,scrhack} -%Stellt zusaetzliche Befehle fuer Gleitobjekte zur Verfuegung -\usepackage{wrapfig} -%Stellt die Moeglichkeit zur Verfuegung Text um Bilder herumlaufen zu lassen. -\usepackage[textfont=it,labelfont=bf,format=plain]{caption} -% Ermoeglicht das einstellen von figureumgebungen -\usepackage{subcaption} - -\usepackage{array}%Verbessert die Darstellung von Tabellen und stellt erweiterte Befehle -%zur Verfuegung. -\usepackage{hhline} %stellt den \hhline in Tabellen zur Verfuegung -\usepackage{delarray} -%stellt eine einfachere Umgebung fuer begrenzte Arrays zur -%Verfuegung.\begin{array} LB {<Spaltenvereinbarung>} RB - -% das tabu Packet, ein machtiges Tabellenpaket -\usepackage{tabu} -\usepackage{colortbl} % Farben in Tabellenzeilen - -%\usepackage{flafter} %Verhindert, dass Gleitobjekte in einem Dokument vor die -%Stelle gesetzt werden, an der sie in der Eingabedatei %aufgebaut werden. -%\usepackage{graphpap}%Zum Setzen von „Millimeter“-Papier. Es definiert den -%graphics paper-Befehl in der picture-Umgebung. - -%\usepackage[]{graphicx} %vorsicht, laedt hyperref -%\usepackage{sidecap} -%Für das malen von Graphen -%Für das malen von Grafiken -% waehle zunaechst das richtige Treiberbackend fuer Tikz. -% beamer erkennt z. T nicht das richtige backend. pgfsys-pdf.def ist die Option, die am meisten unterstuetzt. -%Für das malen von Graphen -\usepackage{tikz} -\usepackage{pgfplots} -\pgfplotsset{compat=newest} -\usetikzlibrary{arrows,% -% petri,% -% topaths,% -% fit,% -% positioning,% -% decorations.pathmorphing,% -% backgrounds,% -}% - -% Ausgabe von Grafiken als externe Grafik -\usetikzlibrary{external} -% \usepgfplotslibrary{external} -\tikzset{external/optimize=true}% -% \tikzset{external/system call= {pdflatex -enable-write18 -shell-escape % -% % % -save-size=80000 % -% % % -pool-size=100000000 % -% % % -extra-mem-top=500000000 % -% % % -extra-mem-bot=100000000 % -% % % -main-memory=900000000 % -% \tikzexternalcheckshellescape % -% -halt-on-error % -% -interaction=batchmode % -% -jobname "\image" "\texsource"}} -\tikzexternalize[% -% %mode=graphics if exists, - up to date check=md5, - figure list=true, - prefix=Tikzcache/,% - ] -\tikzifexternalizing{% -% don’t include package XYZ here -}{% -%hier kommen Pakete hinzu, die Probleme mit der external library von tikz haben -%\usepackage{pdfpages} -%\usepackage{vmargin} -% this package is incompatible with tikz externalization and is problematic -}% -% \usepackage[textsize=normal,textwidth=2cm,obeyFinal]{todonotes} -% %obeyDraft lässt die Notes erscheinen, wenn man draft an hat und nicht, wenn nicht. Vertraegt sich nicht mit hyperref - -% % additional todo stuff -% % extra functionality for todonotes taken from the manual -% % usage: \mycomment[HSM]{Testing second time.}. -% \newcounter{mycomment} -% \newcommand{\mycomment}[2][]{% -% % initials of the author (optional) + note in the margin -% \refstepcounter{mycomment}% -% {% -% \setstretch{0.7}% spacing -% \todo[color={red!100!green!33},size=\small]{% -% \textbf{Comment [\uppercase{#1}\themycomment]:}~#2}% -% }} -% -% % mark whole section -% \newcommand\todoin[2][]{\todo[color={green},inline, caption={2do}, #1]{ -% \begin{minipage}{\textwidth-4pt}#2\end{minipage}}} -% % This example renders like -% % \todoin{ -% % Some text. -% % \begin{align} -% % \sin(\theta)^2 + \cos(\theta)^2 = 1 -% % \end{align} -% % A formula and a list -% % \begin{itemize} -% % \item An item -% % \end{itemize} -% % } -% -% % numbered todonotes -% \newcommand{\ntodo}[2][]{\todo[#1]{\thesubsection{}. #2}} -% % combining everything -% \newcounter{todoListItems} -% \newcommand{\sstodo}[2][] -% {\addtocounter{todoListItems}{1} -% \todo[caption={\protect\hypertarget{todo\thetodoListItems}{}\thesection. #2}, #1] -% {\begin{spacing}{1} \hfill \hyperlink{todo\thetodoListItems}{#2} \end{spacing} }} - - -%\usepackage[position=top]{subfig} -% BIBLIOGRAPHIE -\usepackage[ - backend=biber, -% bibliographystyle=alphabetic, -% style=ieee, %globaler Style (Zitier- und Bibstil) - citestyle=numeric, % Zitierstil -% bibliographystyle=chem-acs, % Bibliographiestil - firstinits=true, % Vornamen abruerzen - sorting=nty, %sort by name,title,year - maxbibnames=99, -% maxnames=99, - language=british, -% abbreviate=true, - doi=false, - isbn=false, - url=false, - sortcites=true, - backref=true, - defernumbers=true, -]{biblatex} -\addbibresource{/home/seusdd/Dissertation/Bibliographie/dissertationsliteratur.bib} - - -%3.PAKETE, DIE DAS ERSTELLEN EINES INDEX ERLEICHTERN -%\usepackage{makeidx} -%'makeidx' Stellt Befehle fuer Indexerstellung zur Verfuegung. -%\usepackage{showidx}%'showidx'bewirkt die Anzeige von Indexeintraegen %im -%Randbereich. - -%3.SONSTIGE NUETZLICHE PAKETE -%\usepackage{ifthen}%Definiert einfache Strukturen der Programmiersprachen -%\usepackage{alltt} % verbatim-Umgebung mit Interpretation von Befehlen. -%Analysepaket zur ueberpruefung der Korrektheit der Syntax bei unterdrueckter -%Ausgabe: -%\usepackage{syntonly}% stellt dem Anwender den Befehl '\syntaxonly'zur Verfuegung, -%der in der Praeambel angegeben werden muss, um beim -%Formatieren die Ausgabe zu unterdruecken; eine bereits vorhandene .dvi-Datei -%bleibt also erhalten. - - -%%%% REFERENZIERUNG %%%%% -% Die Reihenfolge der folgenden 4 Packete ist wichtig. -\usepackage{nameref} -\usepackage[english]{varioref}%Stellt erweiterte Befehle zur Referenzierung von -%Gleitobjekten zur Verfuegung -\usepackage[citecolor=black,urlcolor=blue,linkcolor=blue,colorlinks=true,pdfborder={0 0 % -0},pdfpagelabels,plainpages=false,naturalnames,unicode]{hyperref} -\usepackage{memhfixc} -%\usepackage[ngerman,capitalize]{cleveref} -\usepackage[]{cleveref} - -\usepackage{bookmark} -% Fix fuer das referenzieren von figures -%\usepackage[all]{hypcap} - - -%SEITENEINSTELLUNGEN -\setlength{\parindent}{0cm} %Hebt die Einrueckung von Absaetzen auf. -%\setlength{\textwidth}{14.5cm} %Legt die Textbreite fest -\pagestyle{myheadings} -%\usepackage{titlepage} - -%'plain' wuerde den Seitenkopf leer lassen aber die Seiten unten -%mittig durchnummerieren. 'empty' laesst die Seite komplett leer -%\markright{\today\hfill} -%\usepackage{changepage} -\allowdisplaybreaks[1] %Erlaubt bei der Align-Umgebung dass Zeilen auf -%verschiedene Seiten gesetzt werden. die zahlen 1-4 koennen angegeben werden um -%das Umbrechen noch weiter zu forcieren. - -%\pagestyle{fancy} \fancyhf{} -%\renewcommand{\headrulewidth}{0.4 pt}%Strichdicke -%\setlength{\headheight}{1.2 cm}%Hoehe der Kopfzeile - -%\fancyhead[EL]{\page} -%\fancyhead[ER]{\textsc{\rightmark}} -%\fancyhead[C]{{\Large \textbf{FK019 freier Fall, g-Leiter}}\\\small 24.10.2008} -%\fancyhead[OR]{\page} -%\fancyhead[OL]{\textsc{\rightmark}} - -%% todo makros - -% self made todo solution -\newcommand{\todo}[1]{\marginpar{\textcolor{red}{[\textbf{TODO:} #1]}}} -\newcommand{\todox}[1]{\textcolor{red}{[\textbf{TODO:} #1]}} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/special_symbols.tex b/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/special_symbols.tex deleted file mode 100644 index c697716..0000000 --- a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/special_symbols.tex +++ /dev/null @@ -1,206 +0,0 @@ -%% SPECIAL INTEGRAL SIGNS -% The following example defines macro -% -% \mint{<symbol>}\limits_{...} ^{...} %statt \limits kann auch \nolimits \displaylimits_stehen -% -% The first argument is the symbol that is put in smaller math style in the middle of the integral symbol. -% Then a limits specification follows, any number and order. The last one is used. -% Then one subscript and/or one superscript can follow in any order, but at most one of each type. -% -% The implementation takes care of: -% -% the current math style, -% calculates the correct position for the middle of the integral -% even, if subscript and/or superscript are given with \limits, -% lets the horizontal spacing around the symbol intact and -% is aware of \mathsurround. - - -\makeatletter -\newcommand*{\mint}[1]{% - % #1: overlay symbol - \mint@l{#1}{}% -} -\newcommand*{\mint@l}[2]{% - % #1: overlay symbol - % #2: limits - \@ifnextchar\limits{% - \mint@l{#1}% - }{% - \@ifnextchar\nolimits{% - \mint@l{#1}% - }{% - \@ifnextchar\displaylimits{% - \mint@l{#1}% - }{% - \mint@s{#2}{#1}% - }% - }% - }% -} -\newcommand*{\mint@s}[2]{% - % #1: limits - % #2: overlay symbol - \@ifnextchar_{% - \mint@sub{#1}{#2}% - }{% - \@ifnextchar^{% - \mint@sup{#1}{#2}% - }{% - \mint@{#1}{#2}{}{}% - }% - }% -} -\def\mint@sub#1#2_#3{% - \@ifnextchar^{% - \mint@sub@sup{#1}{#2}{#3}% - }{% - \mint@{#1}{#2}{#3}{}% - }% -} -\def\mint@sup#1#2^#3{% - \@ifnextchar_{% - \mint@sub@sup{#1}{#2}{#3}% - }{% - \mint@{#1}{#2}{}{#3}% - }% -} -\def\mint@sub@sup#1#2#3^#4{% - \mint@{#1}{#2}{#3}{#4}% -} -\def\mint@sup@sub#1#2#3_#4{% - \mint@{#1}{#2}{#4}{#3}% -} -\newcommand*{\mint@}[4]{% - % #1: \limits, \nolimits, \displaylimits - % #2: overlay symbol: -, =, ... - % #3: subscript - % #4: superscript - \mathop{}% - \mkern-\thinmuskip - \mathchoice{% - \mint@@{#1}{#2}{#3}{#4}% - \displaystyle\textstyle\scriptstyle - }{% - \mint@@{#1}{#2}{#3}{#4}% - \textstyle\scriptstyle\scriptstyle - }{% - \mint@@{#1}{#2}{#3}{#4}% - \scriptstyle\scriptscriptstyle\scriptscriptstyle - }{% - \mint@@{#1}{#2}{#3}{#4}% - \scriptscriptstyle\scriptscriptstyle\scriptscriptstyle - }% - \mkern-\thinmuskip - \int#1% - \ifx\\#3\\\else_{#3}\fi - \ifx\\#4\\\else^{#4}\fi -} -\newcommand*{\mint@@}[7]{% - % #1: limits - % #2: overlay symbol - % #3: subscript - % #4: superscript - % #5: math style - % #6: math style for overlay symbol - % #7: math style for subscript/superscript - \begingroup - \sbox0{$#5\int\m@th$}% - \sbox2{$#5\int_{}\m@th$}% - \dimen2=\wd0 % - % => \dimen2 = width of \int - \let\mint@limits=#1\relax - \ifx\mint@limits\relax - \sbox4{$#5\int_{\kern1sp}^{\kern1sp}\m@th$}% - \ifdim\wd4>\wd2 % - \let\mint@limits=\nolimits - \else - \let\mint@limits=\limits - \fi - \fi - \ifx\mint@limits\displaylimits - \ifx#5\displaystyle - \let\mint@limits=\limits - \fi - \fi - \ifx\mint@limits\limits - \sbox0{$#7#3\m@th$}% - \sbox2{$#7#4\m@th$}% - \ifdim\wd0>\dimen2 % - \dimen2=\wd0 % - \fi - \ifdim\wd2>\dimen2 % - \dimen2=\wd2 % - \fi - \fi - \rlap{% - $#5% - \vcenter{% - \hbox to\dimen2{% - \hss - $#6{#2}\m@th$% - \hss - }% - }% - $% - }% - \endgroup -} -% EXAMPLE INTEGRAL SIGNS -% \begin{document} -% \[ -% \displaystyle A\int B -% \textstyle A\int B -% \scriptstyle A\int B -% \scriptscriptstyle A\int B -% \] -% \[ -% \displaystyle A\mint{-} B -% \textstyle A\mint{-} B -% \scriptstyle A\mint{-} B -% \scriptscriptstyle A\mint{-} B -% \] -% \[ -% \displaystyle A\mint{-}_{123}^{456} B -% \textstyle A\mint{-}_{123}^{456} B -% \scriptstyle A\mint{-}_{123}^{456} B -% \scriptscriptstyle A\mint{-}_{123}^{456} B -% \] -% \[ -% \displaystyle A\mint{-}\limits_{12345}^{6} B -% \textstyle A\mint{-}\limits_{12345}^{6} B -% \scriptstyle A\mint{-}\limits_{12345}^{6} B -% \scriptscriptstyle A\mint{-}\limits_{12345}^{6} B -% \] -% \[ -% \displaystyle A\mint{-}\limits_{1}^{23456} B -% \textstyle A\mint{-}\limits_{1}^{23456} B -% \scriptstyle A\mint{-}\limits_{1}^{23456} B -% \scriptscriptstyle A\mint{-}\limits_{1}^{23456} B -% \] -% \[ -% \displaystyle A\mint{-}\displaylimits_{0}^{\infty} B -% \textstyle A\mint{-}\displaylimits_{0}^{\infty} B -% \scriptstyle A\mint{-}\displaylimits_{0}^{\infty} B -% \scriptscriptstyle A\mint{-}\displaylimits_{0}^{\infty} B -% \] -% \[ -% \displaystyle A\mint{=} B -% \textstyle A\mint{=} B -% \scriptstyle A\mint{=} B -% \scriptscriptstyle A\mint{=} B -% \] -% \[ -% \displaystyle A\mint{\equiv} B -% \textstyle A\mint{\equiv} B -% \scriptstyle A\mint{\equiv} B -% \scriptscriptstyle A\mint{\equiv} B -% \] -% \[ -% \displaystyle A\mint{\circ} B -% \textstyle A\mint{\circ} B -% \scriptstyle A\mint{\circ} B -% \scriptscriptstyle A\mint{\circ} B -% \] -%\end{document} - \ No newline at end of file diff --git a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/theoreme_und_farbe.tex b/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/theoreme_und_farbe.tex deleted file mode 100644 index 2ca623f..0000000 --- a/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/theoreme_und_farbe.tex +++ /dev/null @@ -1,366 +0,0 @@ -%FARBDEFINTIONEN -%\definecolor{dunkelblau}{rgb}{0.21,0.37,0.87}definert neue Farben. Mit rgb-Werten in % mit RGB kann man die %RGB werte driket angeben - -%BLAUTOENE -\definecolor{mediumblue}{RGB}{0,0,205} -\definecolor{navyblue}{RGB}{0,0,128} -\definecolor{midnightblue}{RGB}{25,25,112} -\definecolor{royalblue4}{RGB}{39,64,139} -\definecolor{blue3}{RGB}{0,0,205} -\definecolor{steelblue3}{RGB}{79,148,205} -\definecolor{steelblue4}{RGB}{54,100,139} - -%ROT- UND BRAUNTOENE -\definecolor{brown}{RGB}{165,42,42} %Bordaux %heller -\definecolor{brown3}{RGB}{205,51,51} %eher rot -\definecolor{brown4}{RGB}{139,35,35} %ART Bordeaux %etwas dunkler -\definecolor{red3}{RGB}{205,0,0} %bordeauxrot %noch dunkler -\definecolor{tomato}{RGB}{205,79,57} % noch dunkler aehnlich zu red3 -\definecolor{firebrick3}{RGB}{205,38,38} -\definecolor{firebrick4}{RGB}{139,26,26} - -%GELBTOENE -\definecolor{gold}{RGB}{255,215,0} -\definecolor{gold3}{RGB}{238,201,0} %dunkler -\definecolor{darkgoldenrod1}{RGB}{255,185,15} -\definecolor{goldenrod1}{RGB}{255,193,37} -\definecolor{goldenrod}{RGB}{218,165,32} - -%ORANGETOENE -\definecolor{orange}{rgb}{.9,.6,.1} -\definecolor{dunkelorange}{rgb}{.9,.5,.0} -\definecolor{orange2}{RGB}{238,154,0} -\definecolor{orange3}{RGB}{205,133,0} - -%Gruen -\definecolor{darkgreen}{RGB}{0,100,0} -\definecolor{green3}{RGB}{0,205,0} %dunkler als das Standartgruen -\definecolor{olivedrab}{RGB}{107,142,35} -\definecolor{olivedrab2}{RGB}{179,238,58} -\definecolor{olivedrab3}{RGB}{154,205,50} -\definecolor{forestgreen}{RGB}{34,139,34} -\definecolor{darkolivegreen}{RGB}{85,107,47} -\definecolor{darkolivegreen4}{RGB}{110,139,61} -\definecolor{khaki3}{RGB}{205,198,115} - -%Grautoene -\definecolor{grey}{rgb}{0.5,0.5,0.5} -\definecolor{dimgrey}{RGB}{105,105,105} -\definecolor{dimgrey2}{RGB}{153,153,153} -\definecolor{dimgrey3}{RGB}{181,181,181} -\definecolor{lightgrey}{RGB}{211,211,211} -\definecolor{lightergrey}{RGB}{201,201,201} -\definecolor{verylightgrey}{RGB}{222,222,222} - - -%BRAUNTOENE -\definecolor{braun}{rgb}{.6,.5,.1} -\definecolor{braun2}{rgb}{.6,.4,.1} -\definecolor{tan4}{RGB}{149,90,43} - -%%SCHATTIERUNGEN VON WEISS -\definecolor{wheat3}{RGB}{205,186,150} -\definecolor{wheat4}{RGB}{139,126,102} - - -%DEFINITIONEN DER SATZ- UND THEOREMUMGEBUNGEN - -%\newcommand{\<Befehlsname>}{<Definition, was hinterher im Dokument erscheinen soll>} -%"'Befehlsname"` muss %ein wirklich neuer Befehl sein -%\newcommand{\<Befehlsname>}[Anzahl der Argumente des neuen Befehls (1...9)]{#i,#(i+1)} i -%= 1...9 %Beim %Befehlsaufruf erscheint das, was man in die Argumentklammern schreibt an -%der jeweiligen Stelle #i -%Analog fuer folgenden Befehl: "<\Befehl>" muss schon existieren -%\renewcommand{\<Befehl>}{<Definition>} -%\renewcommand{\<Befehl>}[<ArgAnz>]{<Definition>} -\newcommand{\bewend}{\rule{1ex}{1ex}} -%Beweis ende: ausgefuelltes Viereck fuer das Ende eines Beweises. -\newcommand{\latop}[2]{#1 \atop #2} %gibt dem TeX-Befehl \atop eine LaTeX ueblichere Form -\newcommand{\lchoose}[2]{#1 \choose #2} -%gibt dem TeX-Befehl \choose eine LaTeX ueblichere Form - -%%%%%%%%%%%%% ZUNAECHST DIE EIGENEN STYLES %%%%%%%%%%%%% -%erst mal ein Bugfix. -%entweder -% \makeatletter -% \def\thmt@refnamewithcomma #1#2#3,#4,#5\@nil{% -% \@xa\def\csname\thmt@envname #1utorefname\endcsname{#3}% -% \ifcsname #2refname\endcsname -% \csname #2refname\expandafter\endcsname\expandafter{\thmt@envname}{#3}{#4}% -% \fi -% } -% \makeatother -%oder Zur zwischenzeitlichen Abhilfe sollte es helfen, Z.48 in thm-autoref wie folgt -%abzuaendern: \csname #2refname\@xa\endcsname\@xa{\thmt@envname}{#3}{#4}% -%Dies ist in der TeXLive2014 bereits gefixt. - -%Eingener Nummerierungsstyl am Rand und grau -%Damit der Stil margincolored definiert ist muss -% \definecolor{dimgrey}{RGB}{105,105,105} -% \definecolor{dimgrey2}{RGB}{153,153,153} -\makeatletter - \def\thmt@headstyle@margincolored{% - \makebox[0pt][r]{\color{dimgrey}\NUMBER\ }\NAME\NOTE - } -\makeatother -% zu thm-ntheorem.sty und thm-amsthm.sty ergänzt werden. - - -%%%%% Definitionsstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{olivedrab}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -%numbercolor=\color{dimgrey2}, -postheadspace=1em, -qed=\color{olivedrab}$\pmb{\triangleleft}$]{customdefintion} -%Defintion -\declaretheorem[name=Definition,numberwithin=section,style=customdefintion, -refname={Definition,Defintionen}]{df} -%Bezeichnungen -\declaretheorem[name=Bezeichnungen,sibling=df,style=customdefintion, -refname={Bezeichnungen,Bezeichnungen}]{bez} -\declaretheorem[name=Bezeichnung,sibling=df,style=customdefintion, -refname={Bezeichnung,Bezeichnungen}]{bz} -%Bezeichnungen ohne Nummer: -\declaretheorem[name=Bezeichnungen,numbered=no,style=customdefintion, -refname={Bezeichnungen,Bezeichnungen}]{bez*} -%notations -\declaretheorem[name=Notations,sibling=df,style=customdefintion, -refname={Notations,Notations}]{notations} -%notation -\declaretheorem[name=Notation,sibling=df,style=customdefintion, -refname={Notation,Notations}]{notation} -%notations without number: -\declaretheorem[name=Notations,numbered=no,style=customdefintion, -refname={Notations,Notations}]{notations*} -%Assumption -\declaretheorem[name=Assumption,sibling=df,style=customdefintion, -refname={assumption,assumptions}]{assumption} -%Assumptions -\declaretheorem[name=Assumptions,sibling=df,style=customdefintion, -refname={assumptions,assumptions}]{assumptions} - - -%Festlegung mit und ohne nummer -\declaretheorem[name=Festlegung,sibling=df,style=customdefintion, -refname={Festlegungen,Festlegungen}]{festlg} -\declaretheorem[name=Festlegung,numbered=no,style=customdefintion, -refname={Festlegungen,Festlegungen}]{nnfestlg} - -%%%%% Beispiel- und Bemerkungstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber oder margin -headfont={\color{midnightblue}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\normalfont, -postheadspace=1em, -qed=\color{midnightblue}$\pmb{\triangleleft}$]{custombspbem} -%Beispiel -\declaretheorem[numberlike=df,name=Beispiel,style=custombspbem, -refname={Beispiel,Beispiele}]{bsp} -%Bemerkung -\declaretheorem[name=Bemerkung,sibling=df,style=custombspbem, -refname={Bemerkung,Bemerkungen}]{bem} -%Example -\declaretheorem[numberlike=df,name=Example,style=custombspbem, -refname={Example,Examples}]{example} -%remark -\declaretheorem[name=Remark,sibling=df,style=custombspbem, -refname={Remark,Remarks}]{remark} - -%%%%% Lemma-,Korollarstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{steelblue4}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{steelblue4}$\pmb{\lrcorner}$]{customlemma} -%Lemma -\declaretheorem[name=Lemma,sibling=df,style=customlemma, -refname={Lemma,Lemmata}]{lm} -%Korollar -\declaretheorem[name=Korollar,sibling=df,style=customlemma, -refname={Korollar,Korollare}]{kor} -%Corollay -\declaretheorem[name=Corollary,sibling=df,style=customlemma, -refname={Corollary,Corollaries}]{cor} -%Conclusion -\declaretheorem[name=Conclusion,sibling=df,style=customlemma, -refname={Conclusion,Conclusions}]{conclusion} - - - -%%%%% Notizstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{darkgreen}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{darkgreen}$\pmb{\lrcorner}$]{customnotiz} -%Notiz -\declaretheorem[name=Notiz,sibling=df,style=customnotiz, -refname={Notiz,Notizen}]{nz} -%%Spezialnotiz fuer die D-Arbeit: Prinzip der Nullstellensuche -\declaretheorem[name=Prinzip der Nullstellensuche,sibling=df,style=customnotiz, -refname={Notiz,Notizen}]{pdnss} -\declaretheorem[name=Fragestellung,sibling=df,style=customnotiz, -refname={Fragestellung,Fragestellungen}]{frage} -\declaretheorem[name=Fragestellungen,sibling=df,style=customnotiz, -refname={Fragestellungen,Fragestellungen}]{fragen} -%Idea environment -\declaretheorem[name=Idea,sibling=df,style=customnotiz, -refname={idea,ideas}]{idea} -%Main Idea environment -\declaretheorem[name=Main idea,sibling=df,style=customnotiz, -refname={main idea,main ideas}]{mainidea} -%General Idea environment -\declaretheorem[name=General idea,sibling=df,style=customnotiz, -refname={general idea,general ideas}]{generalidea} -%Questions and Tasks -\declaretheorem[name=Questions and Tasks,sibling=df,style=customnotiz, -refname={questions and tasks,question and tasks}]{QuestTasks} -%Problem -\declaretheorem[name=Problem,sibling=df,style=customnotiz, -refname={problem,problems}]{problem} -\declaretheorem[name=Problem,numbered=no,style=customnotiz, -refname={problem,problems}]{problem*} - - - -\declaretheorem[name=Erklärung,sibling=df,style=customnotiz, -refname={Erklärung,Erklärungen}]{erklaerung} -\declaretheorem[name=Erklärung,numbered=no,style=customnotiz, -refname={Erklärung,Erklärungen}]{erklaerung*} - - -%%%%%%%%%%%%Berechnungstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{darkgreen}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\normalfont, -postheadspace=1em, -qed=\color{darkgreen}$\pmb{\bewend}$]{customberechnung} -%Nebenrechnung -\declaretheorem[name=Nebenrechnung,sibling=df,style=customberechnung, -refname={Nebenrechnung,Nebenrechnungen}]{nr} - -%%%%% Satz-, Hauptsatz-, Satz und Definition und Propositionsstyle -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont={\color{firebrick4}\scshape \bfseries}, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\itshape, -postheadspace=1em, -qed=\color{firebrick4}$\lrcorner$]{customsatz} -%Satz -\declaretheorem[name=Satz,sibling=df,style=customsatz, -refname={Satz,S\"atze}]{sz} -%ohne Nummer -\declaretheorem[name=Satz,numbered=no,style=customsatz, -refname={Satz,S\"atze}]{sz*} -%Hauptsatz -\declaretheorem[name=Hauptsatz,sibling=df,style=customsatz, -refname={Hauptsatz,Haupts\"atze}]{hsz} -%ohne Nummer -\declaretheorem[name=Hauptsatz,numbered=no,style=customsatz, -refname={Hauptsatz,Haupts\"atze}]{hsz*} -%Satz und Definition -\declaretheorem[name=Satz und Definition,sibling=df,style=customsatz, -refname={Satz und Definition,S\"atze und Definitionen}]{szdf} -%Proposition -\declaretheorem[sibling=df,name=Proposition,style=customsatz, -refname={Proposition,Propositionen}]{proposition} -% -%theorem -\declaretheorem[name=Theorem,sibling=df,style=customsatz, -refname={Theorem,Theorems}]{satzengl} -%ohne Nummer -\declaretheorem[name=Theorem,numbered=no,style=customsatz, -refname={Theorem,Theorems}]{satzengl*} -%Satz und Definition -\declaretheorem[name=Theorem and Definition,sibling=df,style=customsatz, -refname={Theorem and Definition,Theorems and Definitions}]{thmdf} -%Proposition -\declaretheorem[sibling=df,name=Proposition,style=customsatz, -refname={Proposition,Propositions}]{prop} - - -%%%%%%%%% Beweisumgebung -\declaretheoremstyle[ -spaceabove=6pt, spacebelow=6pt, -headformat=margincolored, %auch moeglich ist swapnumber margin -headfont=\bfseries, -notefont=\normalfont\bfseries, notebraces={(}{)}, -bodyfont=\normalfont, -postheadspace=1em, -qed=\bewend]{custombew} -%Beweis -\declaretheorem[numbered=no,name=Beweis,style=custombew, -refname={Beweis,Beweise}]{bew} -%Proof -\declaretheorem[numbered=no,name=Proof,style=custombew, -refname={Proof,Proofs}]{Proof} - -%%%%%%%%%%%%%%%%%%%%%%% Zitieren von Code %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%allgemeine Vorgaben fuer das Zieren von Code. - -\lstset{% -numberbychapter=true, % -breaklines=true,% -prebreak = \raisebox{0ex}[0ex][0ex]{\ensuremath{\hookleftarrow}},% -breakatwhitespace=false,% -basicstyle=\footnotesize\ttfamily,% -commentstyle=\itshape,% -fontadjust=true,% -tabsize=2,% -stringstyle=\itshape,% -numbers=left,numberstyle=\footnotesize\ttfamily,% -extendedchars=true,% -inputencoding=utf8,% -stepnumber=1,% -frame=shadowbox,% -rulesepcolor=\color{grey},% -backgroundcolor=\color{white},% -showspaces=false,% -showstringspaces=false% -aboveskip={1.5\baselineskip},% -columns=fixed,% -upquote=true,% -} -% Spezialvorgaben fuer das Zitieren von MATLAB Code. -\newcommand{\citematlab}{\lstset{language=Matlab,% -emph={if,elseif,else,end,for,while,function,return},% -emphstyle=\bfseries\color{midnightblue},emph={[2]EigMitLambda,Zerol,CotKlTan -,CotKlTanSpez,XsGrLambda,XsKlLambda,CotGrTan,ordnen,EvenSingTan,einord},% -emphstyle={[2]\bfseries\color{olivedrab}},% -emph={[3]zew,ew,l,L,lambda,ewsum,ewanz,phi,v1,v2},emphstyle={[3]\color{braun}}}} - -\crefname{lstlisting}{listing}{listings} -\Crefname{lstlisting}{Listing}{Listings} -\crefname{problem}{problem}{problems} -\Crefname{problem}{Problem}{Problems} -\crefname{notation}{notation}{notations} -\Crefname{notation}{Notation}{Notations} -\crefname{lm}{lemma}{lemmata} -\Crefname{lm}{Lemma}{Lemmata} -\crefname{assumptions}{assumptions}{assumptions} -\Crefname{assumptions}{Assumptions}{Assumptions} -\crefname{satzengl}{theorem}{theorems} -\Crefname{satzengl}{Theorem}{Theorems} -\crefname{satzengl*}{theorem}{theorems} -\Crefname{satzengl*}{Theorem}{Theorems} -\crefname{cor}{corollary}{corollaries} -\Crefname{cor}{Corollary}{Corollaries} -\crefname{df}{defintion}{defintions} -\Crefname{df}{Defintion}{Defintions} diff --git a/RR-multi-patch-plus-gravity/plots/subsequent_errors.tex b/RR-multi-patch-plus-gravity/plots/subsequent_errors.tex deleted file mode 100644 index 7df36b5..0000000 --- a/RR-multi-patch-plus-gravity/plots/subsequent_errors.tex +++ /dev/null @@ -1,149 +0,0 @@ -\documentclass[a4paper]{scrartcl}%scrartcl -\input{praeambels_and_definitions/artikelpraeambel.tex} -\input{praeambels_and_definitions/artikel_theoreme_und_farbe.tex} -%\input{praeambels_and_definitions/special_symbols.tex} -%%%% MAKROS %%%%%%%%%%%%% restriction -\input{./praeambels_and_definitions/L-Schema_Paper_makros.tex} -% set graphicspath -\graphicspath{ {./} } - -\usepackage{pgfplotstable} - -\begin{document} - % Generation of Subsequent_errors_t0.00 - \tikzsetnextfilename{Subsequent_errors_t0.00} - \tikzset{external/force remake} - \begin{tikzpicture} -% % \path[draw,dashed,thick] (3.13,0) -- (3.13,5.2); - \begin{semilogyaxis}[% - width=\textwidth, - title={ Subsequent errors for $t = 0$, $ h \approx 0.02$, $\tau = 4\cdot 10^{-4}$ }, - % axis lines=left, - % legend style = {draw=none}, - legend cell align = left, - xlabel= {iterations}, - ylabel= {subsequent errors}, - xmin= 0, -% xmax= 53, -% ymin= 0, -% ymax= 0.0003, - grid= both, %major or minor - axis line style={-Latex[round]}, - legend style={ -% anchor=north east, -% at={(1,1)}, - font=\tiny - }, - legend entries={$\bigl\|p_l^i - p_l^{i-1}\bigr\|_{L^2(\dom_1)}$, - $\bigl\|p_l^i - p_l^{i-1}\bigr\|_{L^2(\dom_2)}$}, - ] % end of axis options %col sep=comma, - \addplot table [x=iteration, y=wetting] {../output/mesh_res30_dt0.004/subdomain1_dt0.004_hmin0.019_lambda70_Lw0.25subsequent_iteration_errors_at_time0.00.csv};% - \addplot table [x=iteration, y=wetting] {../output/mesh_res30_dt0.004/subdomain2_dt0.004_hmin0.019_lambda70_Lw0.25subsequent_iteration_errors_at_time0.00.csv};% -% \addplot table [col sep=comma] {../output/subdomain1_subsequent_iteration_error_for_phase_wetting_at_time0.csv};% -% % \addplot table [col sep=comma] {../output/subdomain2_subsequent_iteration_error_for_phase_wetting_at_time0.csv};% - \end{semilogyaxis} - \end{tikzpicture} - - % Generation of Subsequent_errors_t0.00 - \tikzsetnextfilename{Subsequent_errors_t0.05} - \tikzset{external/force remake} - \begin{tikzpicture} -% % \path[draw,dashed,thick] (3.13,0) -- (3.13,5.2); - \begin{semilogyaxis}[% - width=\textwidth, - title={ Subsequent errors for $t = 0.05$, $ h \approx 0.02$, $\tau = 4\cdot 10^{-4}$ }, - % axis lines=left, - % legend style = {draw=none}, - legend cell align = left, - xlabel= {iterations}, - ylabel= {subsequent errors}, -% xmin= 0, -% xmax= 53, -% ymin= 0, -% ymax= 0.0003, - grid= both, %major or minor - axis line style={-Latex[round]}, - legend style={ -% anchor=north east, -% at={(1,1)}, - font=\tiny - }, - legend entries={$\bigl\|p_l^i - p_l^{i-1}\bigr\|_{L^2(\dom_1)}$, - $\bigl\|p_l^i - p_l^{i-1}\bigr\|_{L^2(\dom_2)}$}, - ] % end of axis options %col sep=comma, - \addplot table [x=iteration, y=wetting] {../output/mesh_res30_dt0.004/subdomain1_dt0.004_hmin0.019_lambda70_Lw0.25subsequent_iteration_errors_at_time0.05.csv};% - \addplot table [x=iteration, y=wetting] {../output/mesh_res30_dt0.004/subdomain2_dt0.004_hmin0.019_lambda70_Lw0.25subsequent_iteration_errors_at_time0.05.csv};% -% \addplot table [col sep=comma] {../output/subdomain1_subsequent_iteration_error_for_phase_wetting_at_time0.csv};% -% % \addplot table [col sep=comma] {../output/subdomain2_subsequent_iteration_error_for_phase_wetting_at_time0.csv};% - \end{semilogyaxis} - \end{tikzpicture} - - % Generation of Subsequent_errors_t0.00 - \tikzsetnextfilename{Subsequent_errors_t0.1} - \tikzset{external/force remake} - \begin{tikzpicture} -% % \path[draw,dashed,thick] (3.13,0) -- (3.13,5.2); - \begin{semilogyaxis}[% - width=\textwidth, - title={ Subsequent errors for $t = 0.1$, $ h \approx 0.02$, $\tau = 4\cdot 10^{-4}$ }, - % axis lines=left, - % legend style = {draw=none}, - legend cell align = left, - xlabel= {iterations}, - ylabel= {subsequent errors}, -% xmin= 0, -% xmax= 53, -% ymin= 0, -% ymax= 0.0003, - grid= both, %major or minor - axis line style={-Latex[round]}, - legend style={ -% anchor=north east, -% at={(1,1)}, - font=\tiny - }, - legend entries={$\bigl\|p_l^i - p_l^{i-1}\bigr\|_{L^2(\dom_1)}$, - $\bigl\|p_l^i - p_l^{i-1}\bigr\|_{L^2(\dom_2)}$}, - ] % end of axis options %col sep=comma, - \addplot table [x=iteration, y=wetting] {../output/mesh_res30_dt0.004/subdomain1_dt0.004_hmin0.019_lambda70_Lw0.25subsequent_iteration_errors_at_time0.10.csv};% - \addplot table [x=iteration, y=wetting] {../output/mesh_res30_dt0.004/subdomain2_dt0.004_hmin0.019_lambda70_Lw0.25subsequent_iteration_errors_at_time0.10.csv};% -% \addplot table [col sep=comma] {../output/subdomain1_subsequent_iteration_error_for_phase_wetting_at_time0.csv};% -% % \addplot table [col sep=comma] {../output/subdomain2_subsequent_iteration_error_for_phase_wetting_at_time0.csv};% - \end{semilogyaxis} - \end{tikzpicture} - - % Generation of Subsequent_errors_t0.00 - \tikzsetnextfilename{Subsequent_errors_t0.14} - \tikzset{external/force remake} - \begin{tikzpicture} -% % \path[draw,dashed,thick] (3.13,0) -- (3.13,5.2); - \begin{semilogyaxis}[% - width=\textwidth, - title={ Subsequent errors for $t = 0.14$, $ h \approx 0.02$, $\tau = 4\cdot 10^{-4}$ }, - % axis lines=left, - % legend style = {draw=none}, - legend cell align = left, - xlabel= {iterations}, - ylabel= {subsequent errors}, -% xmin= 0, -% xmax= 53, -% ymin= 0, -% ymax= 0.0003, - grid= both, %major or minor - axis line style={-Latex[round]}, - legend style={ -% anchor=north east, -% at={(1,1)}, - font=\tiny - }, - legend entries={$\bigl\|p_l^i - p_l^{i-1}\bigr\|_{L^2(\dom_1)}$, - $\bigl\|p_l^i - p_l^{i-1}\bigr\|_{L^2(\dom_2)}$}, - ] % end of axis options %col sep=comma, - \addplot table [x=iteration, y=wetting] {../output/mesh_res30_dt0.004/subdomain1_dt0.004_hmin0.019_lambda70_Lw0.25subsequent_iteration_errors_at_time0.14.csv};% - \addplot table [x=iteration, y=wetting] {../output/mesh_res30_dt0.004/subdomain2_dt0.004_hmin0.019_lambda70_Lw0.25subsequent_iteration_errors_at_time0.14.csv};% -% \addplot table [col sep=comma] {../output/subdomain1_subsequent_iteration_error_for_phase_wetting_at_time0.csv};% -% % \addplot table [col sep=comma] {../output/subdomain2_subsequent_iteration_error_for_phase_wetting_at_time0.csv};% - \end{semilogyaxis} - \end{tikzpicture} - -\end{document} diff --git a/RR-multi-patch-plus-gravity-const-solution/RR-multi-patch-with-gravity-constant-solution.py b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity-const-solution/RR-multi-patch-with-gravity-constant-solution.py similarity index 100% rename from RR-multi-patch-plus-gravity-const-solution/RR-multi-patch-with-gravity-constant-solution.py rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity-const-solution/RR-multi-patch-with-gravity-constant-solution.py diff --git a/RR-multi-patch-plus-gravity/RR-multi-patch-with-gravity.py b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/RR-multi-patch-with-gravity.py similarity index 100% rename from RR-multi-patch-plus-gravity/RR-multi-patch-with-gravity.py rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/RR-multi-patch-with-gravity.py diff --git a/RR-multi-patch-plus-gravity/plots/Makefile b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Makefile similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Makefile rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Makefile diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time-with-gravity.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time-with-gravity.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time-with-gravity.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time-with-gravity.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time-with-gravity.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time-with-gravity.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time-with-gravity.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time-with-gravity.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/Errornorm-exact-solution-over-time.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.00.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.00.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.00.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.00.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.00.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.00.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.00.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.00.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.01.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.01.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.01.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.01.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.01.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.01.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.01.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.01.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.02.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.02.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.02.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.02.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.02.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.02.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.02.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.02.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.03.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.03.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.03.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.03.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.03.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.03.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.03.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.03.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.04.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.04.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.04.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.04.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.04.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.04.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.04.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.04.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.05.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.05.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.05.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.05.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.05.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.05.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.05.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.05.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.06.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.06.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.06.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.06.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.06.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.06.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.06.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.06.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.07.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.07.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.07.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.07.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.07.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.07.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.07.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.07.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.08.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.08.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.08.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.08.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.08.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.08.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.08.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.08.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.12.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.12.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.12.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.12.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.12.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.12.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.12.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.12.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.16.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.16.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.16.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.16.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.16.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.16.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.16.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.16.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.20.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.20.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.20.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.20.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.20.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.20.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.20.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.20.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.24.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.24.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.24.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.24.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.24.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.24.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.24.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.24.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.28.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.28.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.28.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.28.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.28.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.28.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.28.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.28.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.32.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.32.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.32.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.32.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.32.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.32.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.32.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.32.png diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.36.dep b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.36.dep similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.36.dep rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.36.dep diff --git a/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.36.png b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.36.png similarity index 100% rename from RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.36.png rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/Tikzcache/RR-2-patch-subsequent_errors_t0.36.png diff --git a/RR-multi-patch-plus-gravity/plots/meshres20_dt0.01_exact_solution_error_norms.tex b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/meshres20_dt0.01_exact_solution_error_norms.tex similarity index 100% rename from RR-multi-patch-plus-gravity/plots/meshres20_dt0.01_exact_solution_error_norms.tex rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/meshres20_dt0.01_exact_solution_error_norms.tex diff --git a/RR-multi-patch-plus-gravity/plots/meshres20_dt0.01_subsequent_errors.tex b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/meshres20_dt0.01_subsequent_errors.tex similarity index 100% rename from RR-multi-patch-plus-gravity/plots/meshres20_dt0.01_subsequent_errors.tex rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/meshres20_dt0.01_subsequent_errors.tex diff --git a/RR-2-patch-test-case/plots/praeambels_and_definitions/.dropbox.attr b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/.dropbox.attr similarity index 100% rename from RR-2-patch-test-case/plots/praeambels_and_definitions/.dropbox.attr rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/.dropbox.attr diff --git a/RR-2-patch-test-case/plots/praeambels_and_definitions/Diplomarbeitsskriptpraeambel/theoreme_und_farbe.tex b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/Diplomarbeitsskriptpraeambel/theoreme_und_farbe.tex similarity index 100% rename from RR-2-patch-test-case/plots/praeambels_and_definitions/Diplomarbeitsskriptpraeambel/theoreme_und_farbe.tex rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/Diplomarbeitsskriptpraeambel/theoreme_und_farbe.tex diff --git a/RR-2-patch-test-case/plots/praeambels_and_definitions/L-Schema_Paper_makros.tex b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/L-Schema_Paper_makros.tex similarity index 100% rename from RR-2-patch-test-case/plots/praeambels_and_definitions/L-Schema_Paper_makros.tex rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/L-Schema_Paper_makros.tex diff --git a/RR-2-patch-test-case/plots/praeambels_and_definitions/artikel_theoreme_und_farbe.tex b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikel_theoreme_und_farbe.tex similarity index 100% rename from RR-2-patch-test-case/plots/praeambels_and_definitions/artikel_theoreme_und_farbe.tex rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikel_theoreme_und_farbe.tex diff --git a/RR-2-patch-test-case/plots/praeambels_and_definitions/artikelpraeambel.tex b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikelpraeambel.tex similarity index 100% rename from RR-2-patch-test-case/plots/praeambels_and_definitions/artikelpraeambel.tex rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/artikelpraeambel.tex diff --git a/RR-2-patch-test-case/plots/praeambels_and_definitions/lualatexartikelpraeambel.tex b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/lualatexartikelpraeambel.tex similarity index 100% rename from RR-2-patch-test-case/plots/praeambels_and_definitions/lualatexartikelpraeambel.tex rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/lualatexartikelpraeambel.tex diff --git a/RR-2-patch-test-case/plots/praeambels_and_definitions/special_symbols.tex b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/special_symbols.tex similarity index 100% rename from RR-2-patch-test-case/plots/praeambels_and_definitions/special_symbols.tex rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/special_symbols.tex diff --git a/RR-2-patch-test-case/plots/praeambels_and_definitions/theoreme_und_farbe.tex b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/theoreme_und_farbe.tex similarity index 100% rename from RR-2-patch-test-case/plots/praeambels_and_definitions/theoreme_und_farbe.tex rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/praeambels_and_definitions/theoreme_und_farbe.tex diff --git a/RR-2-patch-test-case/plots/subsequent_errors.tex b/Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/subsequent_errors.tex similarity index 100% rename from RR-2-patch-test-case/plots/subsequent_errors.tex rename to Richards-Richards/multi-patch/RR-multi-patch-plus-gravity/plots/subsequent_errors.tex diff --git a/RR-multi-patch-with-inner-patch-const-solution/RR-multi-patch-with-inner-patch-constant-solution.py b/Richards-Richards/multi-patch/RR-multi-patch-with-inner-patch-const-solution/RR-multi-patch-with-inner-patch-constant-solution.py similarity index 100% rename from RR-multi-patch-with-inner-patch-const-solution/RR-multi-patch-with-inner-patch-constant-solution.py rename to Richards-Richards/multi-patch/RR-multi-patch-with-inner-patch-const-solution/RR-multi-patch-with-inner-patch-constant-solution.py diff --git a/RR-multi-patch-with-inner-patch/RR-multi-patch-with-inner-patch.py b/Richards-Richards/multi-patch/RR-multi-patch-with-inner-patch/RR-multi-patch-with-inner-patch.py similarity index 100% rename from RR-multi-patch-with-inner-patch/RR-multi-patch-with-inner-patch.py rename to Richards-Richards/multi-patch/RR-multi-patch-with-inner-patch/RR-multi-patch-with-inner-patch.py diff --git a/RR-2-patch-symmetric-analytic-soltion/RR-2-patch-symmetric.py b/Richards-Richards/two-patch/RR-two-patch-symmetric-analytic-soltion/RR-2-patch-symmetric.py similarity index 100% rename from RR-2-patch-symmetric-analytic-soltion/RR-2-patch-symmetric.py rename to Richards-Richards/two-patch/RR-two-patch-symmetric-analytic-soltion/RR-2-patch-symmetric.py diff --git a/RR-2-patch-test-case/RR-2-patch-test.py b/Richards-Richards/two-patch/RR-two-patch-test-case/RR-2-patch-test.py similarity index 100% rename from RR-2-patch-test-case/RR-2-patch-test.py rename to Richards-Richards/two-patch/RR-two-patch-test-case/RR-2-patch-test.py diff --git a/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting.py b/Richards-Two-phase/multi-patch/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting.py similarity index 100% rename from TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting.py rename to Richards-Two-phase/multi-patch/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting.py diff --git a/TP-R-two-patch-test-case-constant-solution/TP-R-2-patch-test-constant-solution.py b/Richards-Two-phase/two-patch/TP-R-two-patch-test-case-constant-solution/TP-R-2-patch-test-constant-solution.py similarity index 100% rename from TP-R-two-patch-test-case-constant-solution/TP-R-2-patch-test-constant-solution.py rename to Richards-Two-phase/two-patch/TP-R-two-patch-test-case-constant-solution/TP-R-2-patch-test-constant-solution.py diff --git a/TP-R-two-patch-test-case/TP-R-2-patch-test.py b/Richards-Two-phase/two-patch/TP-R-two-patch-test-case/TP-R-2-patch-test.py similarity index 100% rename from TP-R-two-patch-test-case/TP-R-2-patch-test.py rename to Richards-Two-phase/two-patch/TP-R-two-patch-test-case/TP-R-2-patch-test.py diff --git a/TP-R-two-patch-test-case/mesh_studies/TP-R-2-patch-mesh-study.py b/Richards-Two-phase/two-patch/TP-R-two-patch-test-case/mesh_studies/TP-R-2-patch-mesh-study.py similarity index 100% rename from TP-R-two-patch-test-case/mesh_studies/TP-R-2-patch-mesh-study.py rename to Richards-Two-phase/two-patch/TP-R-two-patch-test-case/mesh_studies/TP-R-2-patch-mesh-study.py diff --git a/Test_misc/taaaeeeeeeschd.py b/Test_misc/taaaeeeeeeschd.py deleted file mode 100755 index 3d07eb3..0000000 --- a/Test_misc/taaaeeeeeeschd.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/python3 - -import dolfin as df - -mesh = df.UnitIntervalMesh(2) - -dx = df.dx -ds = df.ds - -V = df.FunctionSpace(mesh, 'CG', 1) - -v = df.TestFunction(V) -u = df.Function(V) - -# set k constant to 42 -# k = df.Constant(42) -k = df.Expression('2*x[0]', domain = mesh, degree=1) -k = df.interpolate(k, V) - -n = df.FacetNormal(mesh) -print(k.vector().get_local()) -print(df.assemble(k*v*dx).get_local()) -print(df.assemble(df.dot(df.grad(k),n)*v*ds).get_local()) - - -# solve k*u'' = 0 -a = u.dx(0)*k*v.dx(0)*dx + u.dx(0)*k.dx(0)*v*dx - -print('Form: \n', df.assemble(a).get_local()) -bcL = df.DirichletBC(V,df.Constant(10.),"on_boundary && x[0] < 0.5") -bcR = df.DirichletBC(V,df.Constant(1.),"on_boundary && x[0] > 0.5") -bcs= [bcL,bcR] - -df.solve(a == 0,u,bcs=bcs) - -df.File('./taaeschd_u1.pvd') << u - -# change value of k at one boundary point -k.vector()[0] = 1.e6 -print(k.vector().get_local()) -print(df.assemble(k*dx)) -print(df.assemble(k*ds)) - -df.solve(a == 0,u,bcs=bcs) -df.File('./taaeschd_u2.pvd') << u diff --git a/TP-TP-layered-soil-case-const-solution/TP-TP-layered_soil-const-solution.py b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-const-solution/TP-TP-layered_soil-const-solution.py similarity index 100% rename from TP-TP-layered-soil-case-const-solution/TP-TP-layered_soil-const-solution.py rename to Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-const-solution/TP-TP-layered_soil-const-solution.py diff --git a/TP-TP-layered-soil-case-with-inner-patch-constant-solution/TP-TP-layered_soil_with_inner_patch_const_solution.py b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch-constant-solution/TP-TP-layered_soil_with_inner_patch_const_solution.py similarity index 100% rename from TP-TP-layered-soil-case-with-inner-patch-constant-solution/TP-TP-layered_soil_with_inner_patch_const_solution.py rename to Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch-constant-solution/TP-TP-layered_soil_with_inner_patch_const_solution.py diff --git a/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic-split-up-interface.py b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic-split-up-interface.py similarity index 100% rename from TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic-split-up-interface.py rename to Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic-split-up-interface.py diff --git a/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic.py b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic.py similarity index 100% rename from TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic.py rename to Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic.py diff --git a/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch.py b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch.py similarity index 100% rename from TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch.py rename to Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch.py diff --git a/TP-TP-layered-soil-case/TP-TP-layered_soil-second-example.py b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-second-example.py similarity index 100% rename from TP-TP-layered-soil-case/TP-TP-layered_soil-second-example.py rename to Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-second-example.py diff --git a/TP-TP-layered-soil-case/TP-TP-layered_soil.py b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil.py similarity index 100% rename from TP-TP-layered-soil-case/TP-TP-layered_soil.py rename to Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil.py diff --git a/TP-TP-layered-soil-case/TP-TP-layered_soil_pure_dd.py b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil_pure_dd.py similarity index 100% rename from TP-TP-layered-soil-case/TP-TP-layered_soil_pure_dd.py rename to Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil_pure_dd.py diff --git a/TP-TP-layered-soil-case/mesh_study/TP-TP-layered_soil_pure_dd_mesh_study.py b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/mesh_study/TP-TP-layered_soil_pure_dd_mesh_study.py similarity index 100% rename from TP-TP-layered-soil-case/mesh_study/TP-TP-layered_soil_pure_dd_mesh_study.py rename to Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/mesh_study/TP-TP-layered_soil_pure_dd_mesh_study.py diff --git a/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/TP-multi-patch-with-gravity-same-wetting-phase-as-RR.py b/Two-phase-Two-phase/multi-patch/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/TP-multi-patch-with-gravity-same-wetting-phase-as-RR.py similarity index 100% rename from TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/TP-multi-patch-with-gravity-same-wetting-phase-as-RR.py rename to Two-phase-Two-phase/multi-patch/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/TP-multi-patch-with-gravity-same-wetting-phase-as-RR.py diff --git a/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/old_geometry.py b/Two-phase-Two-phase/multi-patch/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/old_geometry.py similarity index 100% rename from TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/old_geometry.py rename to Two-phase-Two-phase/multi-patch/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/old_geometry.py diff --git a/TP-one-patch/TP-one-patch-alterantive.py b/Two-phase-Two-phase/one-patch/TP-one-patch/TP-one-patch-alterantive.py similarity index 100% rename from TP-one-patch/TP-one-patch-alterantive.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/TP-one-patch-alterantive.py diff --git a/TP-one-patch/TP-one-patch-linear-koefficients.py b/Two-phase-Two-phase/one-patch/TP-one-patch/TP-one-patch-linear-koefficients.py similarity index 100% rename from TP-one-patch/TP-one-patch-linear-koefficients.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/TP-one-patch-linear-koefficients.py diff --git a/TP-one-patch/TP-one-patch-purely-postive-pc.py b/Two-phase-Two-phase/one-patch/TP-one-patch/TP-one-patch-purely-postive-pc.py similarity index 100% rename from TP-one-patch/TP-one-patch-purely-postive-pc.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/TP-one-patch-purely-postive-pc.py diff --git a/TP-one-patch/TP-one-patch.py b/Two-phase-Two-phase/one-patch/TP-one-patch/TP-one-patch.py similarity index 100% rename from TP-one-patch/TP-one-patch.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/TP-one-patch.py diff --git a/TP-one-patch/debug_tests/R-one-patch-const-in-time.py b/Two-phase-Two-phase/one-patch/TP-one-patch/debug_tests/R-one-patch-const-in-time.py similarity index 100% rename from TP-one-patch/debug_tests/R-one-patch-const-in-time.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/debug_tests/R-one-patch-const-in-time.py diff --git a/TP-one-patch/mesh_study/R-one-patch-mesh-study-alternative.py b/Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study/R-one-patch-mesh-study-alternative.py similarity index 100% rename from TP-one-patch/mesh_study/R-one-patch-mesh-study-alternative.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study/R-one-patch-mesh-study-alternative.py diff --git a/TP-one-patch/mesh_study/R-one-patch-mesh-study.py b/Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study/R-one-patch-mesh-study.py similarity index 100% rename from TP-one-patch/mesh_study/R-one-patch-mesh-study.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study/R-one-patch-mesh-study.py diff --git a/TP-one-patch/mesh_study/TP-one-patch-mesh-study.py b/Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study/TP-one-patch-mesh-study.py similarity index 100% rename from TP-one-patch/mesh_study/TP-one-patch-mesh-study.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study/TP-one-patch-mesh-study.py diff --git a/TP-one-patch/mesh_study_for_fixed_timestep/R-one-patch-mesh-study-fixed-timestep.py b/Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study_for_fixed_timestep/R-one-patch-mesh-study-fixed-timestep.py similarity index 100% rename from TP-one-patch/mesh_study_for_fixed_timestep/R-one-patch-mesh-study-fixed-timestep.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study_for_fixed_timestep/R-one-patch-mesh-study-fixed-timestep.py diff --git a/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-constant-pressures.py b/Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-constant-pressures.py similarity index 100% rename from TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-constant-pressures.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-constant-pressures.py diff --git a/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-nonwetting0.py b/Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-nonwetting0.py similarity index 100% rename from TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-nonwetting0.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-nonwetting0.py diff --git a/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-wetting0.py b/Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-wetting0.py similarity index 100% rename from TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-wetting0.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep-wetting0.py diff --git a/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep.py b/Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep.py similarity index 100% rename from TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep.py rename to Two-phase-Two-phase/one-patch/TP-one-patch/mesh_study_for_fixed_timestep/TP-one-patch-mesh-study-fixed-timestep.py diff --git a/TP-TP-2-patch-constant-solution/TP-TP-2-patch-constant-solution.py b/Two-phase-Two-phase/two-patch/TP-TP-2-patch-constant-solution/TP-TP-2-patch-constant-solution.py similarity index 100% rename from TP-TP-2-patch-constant-solution/TP-TP-2-patch-constant-solution.py rename to Two-phase-Two-phase/two-patch/TP-TP-2-patch-constant-solution/TP-TP-2-patch-constant-solution.py diff --git a/Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-horizontal-interface-avoiding-origin-alternative.py b/Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-horizontal-interface-avoiding-origin-alternative.py new file mode 100755 index 0000000..f22c819 --- /dev/null +++ b/Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-horizontal-interface-avoiding-origin-alternative.py @@ -0,0 +1,554 @@ +#!/usr/bin/python3 +import dolfin as df +import mshr +import numpy as np +import sympy as sym +import typing as tp +import domainPatch as dp +import LDDsimulation as ldd +import functools as ft +import helpers as hlp +import datetime + +date = datetime.datetime.now() +datestr = date.strftime("%Y-%m-%d") +#import ufl as ufl + +# init sympy session +sym.init_printing() + +use_case = "TP-TP-2-patch-really-pure-dd-horizontal-switch-interface" +solver_tol = 1E-6 +max_iter_num = 1000 + +############ GRID ####################### +mesh_resolution = 30 +timestep_size = 0.0001 +number_of_timesteps = 3000 +# decide how many timesteps you want analysed. Analysed means, that we write out +# subsequent errors of the L-iteration within the timestep. +number_of_timesteps_to_analyse = 6 +starttime = 0 + +Lw = 1 #/timestep_size +Lnw=Lw + +lambda_w = 4 +lambda_nw = 4 + +include_gravity = False +debugflag = False +analyse_condition = True + +output_string = "./output/{}-lower-error-tol-{}_timesteps{}_".format(datestr, use_case, number_of_timesteps) + +##### Domain and Interface #### +# global simulation domain domain +sub_domain0_vertices = [df.Point(-1.0,-1.0), # + df.Point(1.0,-1.0),# + df.Point(1.0,1.0),# + df.Point(-1.0,1.0)] +# interface between subdomain1 and subdomain2 +interface12_vertices = [df.Point(-1.0, 0.6), + df.Point(1.0, 0.6) ] +# subdomain1. +sub_domain1_vertices = [interface12_vertices[0], + interface12_vertices[1], + sub_domain0_vertices[2], + sub_domain0_vertices[3] ] + +# vertex coordinates of the outer boundaries. If it can not be specified as a +# polygon, use an entry per boundary polygon. This information is used for defining +# the Dirichlet boundary conditions. If a domain is completely internal, the +# dictionary entry should be 0: None +subdomain1_outer_boundary_verts = { + 0: [interface12_vertices[1], + sub_domain0_vertices[2], + sub_domain0_vertices[3], # + interface12_vertices[0]] +} +# subdomain2 +sub_domain2_vertices = [sub_domain0_vertices[0], + sub_domain0_vertices[1], + interface12_vertices[1], + interface12_vertices[0] ] + +subdomain2_outer_boundary_verts = { + 0: [interface12_vertices[0], # + sub_domain0_vertices[0], + sub_domain0_vertices[1], + interface12_vertices[1]] +} +# subdomain2_outer_boundary_verts = { +# 0: [interface12_vertices[0], df.Point(0.0,0.0)],# +# 1: [df.Point(0.0,0.0), df.Point(1.0,0.0)], # +# 2: [df.Point(1.0,0.0), interface12_vertices[1]] +# } +# subdomain2_outer_boundary_verts = { +# 0: None +# } + +# list of subdomains given by the boundary polygon vertices. +# Subdomains are given as a list of dolfin points forming +# a closed polygon, such that mshr.Polygon(subdomain_def_points[i]) can be used +# to create the subdomain. subdomain_def_points[0] contains the +# vertices of the global simulation domain and subdomain_def_points[i] contains the +# vertices of the subdomain i. +subdomain_def_points = [sub_domain0_vertices,# + sub_domain1_vertices,# + sub_domain2_vertices] +# in the below list, index 0 corresponds to the 12 interface which has index 1 +interface_def_points = [interface12_vertices] + +# if a subdomain has no outer boundary write None instead, i.e. +# i: None +# if i is the index of the inner subdomain. +outer_boundary_def_points = { + # subdomain number + 1 : subdomain1_outer_boundary_verts, + 2 : subdomain2_outer_boundary_verts +} + +# adjacent_subdomains[i] contains the indices of the subdomains sharing the +# interface i (i.e. given by interface_def_points[i]). +adjacent_subdomains = [[1,2]] +isRichards = { + 1: False, # + 2: False + } + + +viscosity = {# +# subdom_num : viscosity + 1 : {'wetting' :1, + 'nonwetting': 1}, # + 2 : {'wetting' :1, + 'nonwetting': 1} +} + +porosity = {# +# subdom_num : porosity + 1 : 1,# + 2 : 1 +} + +# Dict of the form: { subdom_num : density } +densities = { + 1: {'wetting': 1, #997, + 'nonwetting': 1}, #1225}, + 2: {'wetting': 1, #997, + 'nonwetting': 1}, #1225}, +} + +gravity_acceleration = 9.81 + + +L = {# +# subdom_num : subdomain L for L-scheme + 1 : {'wetting' :Lw, + 'nonwetting': Lnw},# + 2 : {'wetting' :Lw, + 'nonwetting': Lnw} +} + + +lambda_param = {# +# subdom_num : lambda parameter for the L-scheme + 1 : {'wetting' :lambda_w, + 'nonwetting': lambda_nw},# + 2 : {'wetting' :lambda_w, + 'nonwetting': lambda_nw} +} + +## relative permeabilty functions on subdomain 1 +def rel_perm1w(s): + # relative permeabilty wetting on subdomain1 + return s**2 + +def rel_perm1nw(s): + # relative permeabilty nonwetting on subdomain1 + return (1-s)**2 + +_rel_perm1w = ft.partial(rel_perm1w) +_rel_perm1nw = ft.partial(rel_perm1nw) + +subdomain1_rel_perm = { + 'wetting': _rel_perm1w,# + 'nonwetting': _rel_perm1nw +} +## relative permeabilty functions on subdomain 2 +def rel_perm2w(s): + # relative permeabilty wetting on subdomain2 + return s**2 +def rel_perm2nw(s): + # relative permeabilty nonwetting on subdosym.cos(0.8*t - (0.8*x + 1/7*y))main2 + return (1-s)**2 + +_rel_perm2w = ft.partial(rel_perm2w) +_rel_perm2nw = ft.partial(rel_perm2nw) + +subdomain2_rel_perm = { + 'wetting': _rel_perm2w,# + 'nonwetting': _rel_perm2nw +} + +## dictionary of relative permeabilties on all domains. +relative_permeability = {# + 1: subdomain1_rel_perm, + 2: subdomain2_rel_perm +} + + +# definition of the derivatives of the relative permeabilities +# relative permeabilty functions on subdomain 1 +def rel_perm1w_prime(s): + # relative permeabilty on subdomain1 + return 2*s + +def rel_perm1nw_prime(s): + # relative permeabilty on subdomain1 + return -2*(1-s) + +# # definition of the derivatives of the relative permeabilities +# # relative permeabilty functions on subdomain 1 +def rel_perm2w_prime(s): + # relative permeabilty on subdomain1 + return 2*s + +def rel_perm2nw_prime(s): + # relative permeabilty on subdomain1 + return -2*(1-s) + +_rel_perm1w_prime = ft.partial(rel_perm1w_prime) +_rel_perm1nw_prime = ft.partial(rel_perm1nw_prime) +_rel_perm2w_prime = ft.partial(rel_perm2w_prime) +_rel_perm2nw_prime = ft.partial(rel_perm2nw_prime) + +subdomain1_rel_perm_prime = { + 'wetting': _rel_perm1w_prime, + 'nonwetting': _rel_perm1nw_prime +} + + +subdomain2_rel_perm_prime = { + 'wetting': _rel_perm2w_prime, + 'nonwetting': _rel_perm2nw_prime +} + +# dictionary of relative permeabilties on all domains. +ka_prime = { + 1: subdomain1_rel_perm_prime, + 2: subdomain2_rel_perm_prime, +} + + + +def saturation(pc, index): + # inverse capillary pressure-saturation-relationship + return df.conditional(pc > 0, 1/((1 + pc)**(1/(index + 1))), 1) + + + +def pc_sat_rel_sym(S, index): + # capillary pressure-saturation-relationship + return 1/S**(index+1) -1 + +pc_saturation_sym = { + 1: ft.partial(pc_sat_rel_sym, index=1), + 2: ft.partial(pc_sat_rel_sym, index=1), +} + +def saturation_sym(pc, index): + # inverse capillary pressure-saturation-relationship + return 1/((1 + pc)**(1/(index + 1))) + + +# derivative of S-pc relationship with respect to pc. This is needed for the +# construction of a analytic solution. +def saturation_sym_prime(pc, index): + # inverse capillary pressure-saturation-relationship + return -1/((index+1)*(1 + pc)**((index+2)/(index+1))) + + +# note that the conditional definition of S-pc in the nonsymbolic part will be +# incorporated in the construction of the exact solution below. +S_pc_sym = { + 1: ft.partial(saturation_sym, index=1), + 2: ft.partial(saturation_sym, index=1), + # 3: ft.partial(saturation_sym, index=2), + # 4: ft.partial(saturation_sym, index=1) +} + +S_pc_sym_prime = { + 1: ft.partial(saturation_sym_prime, index=1), + 2: ft.partial(saturation_sym_prime, index=1), + # 3: ft.partial(saturation_sym_prime, index=2), + # 4: ft.partial(saturation_sym_prime, index=1) +} + +sat_pressure_relationship = { + 1: ft.partial(saturation, index=1), + 2: ft.partial(saturation, index=1), + # 3: ft.partial(saturation, index=2), + # 4: ft.partial(saturation, index=1) +} + +# +# def saturation(pc, n_index, alpha): +# # inverse capillary pressure-saturation-relationship +# return df.conditional(pc > 0, 1/((1 + (alpha*pc)**n_index)**((n_index - 1)/n_index)), 1) +# +# # S-pc-relation ship. We use the van Genuchten approach, i.e. pc = 1/alpha*(S^{-1/m} -1)^1/n, where +# # we set alpha = 0, assume m = 1-1/n (see Helmig) and assume that residual saturation is Sw +# def saturation_sym(pc, n_index, alpha): +# # inverse capillary pressure-saturation-relationship +# #df.conditional(pc > 0, +# return 1/((1 + (alpha*pc)**n_index)**((n_index - 1)/n_index)) +# +# +# # derivative of S-pc relationship with respect to pc. This is needed for the +# # construction of a analytic solution. +# def saturation_sym_prime(pc, n_index, alpha): +# # inverse capillary pressure-saturation-relationship +# return -(alpha*(n_index - 1)*(alpha*pc)**(n_index - 1)) / ( (1 + (alpha*pc)**n_index)**((2*n_index - 1)/n_index) ) +# +# # note that the conditional definition of S-pc in the nonsymbolic part will be +# # incorporated in the construction of the exact solution below. +# S_pc_sym = { +# 1: ft.partial(saturation_sym, n_index=3, alpha=0.001), +# 2: ft.partial(saturation_sym, n_index=6, alpha=0.001), +# # 3: ft.partial(saturation_sym, n_index=3, alpha=0.001), +# # 4: ft.partial(saturation_sym, n_index=3, alpha=0.001), +# # 5: ft.partial(saturation_sym, n_index=3, alpha=0.001), +# # 6: ft.partial(saturation_sym, n_index=3, alpha=0.001) +# } +# +# S_pc_sym_prime = { +# 1: ft.partial(saturation_sym_prime, n_index=3, alpha=0.001), +# 2: ft.partial(saturation_sym_prime, n_index=6, alpha=0.001), +# # 3: ft.partial(saturation_sym_prime, n_index=3, alpha=0.001), +# # 4: ft.partial(saturation_sym_prime, n_index=3, alpha=0.001), +# # 5: ft.partial(saturation_sym_prime, n_index=3, alpha=0.001), +# # 6: ft.partial(saturation_sym_prime, n_index=3, alpha=0.001) +# } +# +# sat_pressure_relationship = { +# 1: ft.partial(saturation, n_index=3, alpha=0.001), +# 2: ft.partial(saturation, n_index=6, alpha=0.001),p1w + Spc[1] +# # 3: ft.partial(saturation, n_index=3, alpha=0.001), +# # 4: ft.partial(saturation, n_index=3, alpha=0.001), +# # 5: ft.partial(saturation, n_index=3, alpha=0.001), +# # 6: ft.partial(saturation, n_index=3, alpha=0.001) +# } +# + + +############################################# +# Manufacture source expressions with sympy # +############################################# +x, y = sym.symbols('x[0], x[1]') # needed by UFL +t = sym.symbols('t', positive=True) + +symbols = { "x": x, + "y": y, + "t": t} + +# epsilon_x_inner = 0.7 +# epsilon_x_outer = 0.99 +# epsilon_y_inner = epsilon_x_inner +# epsilon_y_outer = epsilon_x_outer +# +# def mollifier(x, epsilon): +# """ one d mollifier """ +# out_expr = sym.exp(-1/(1-(x/epsilon)**2) + 1) +# return out_expr +# +# mollifier_handle = ft.partial(mollifier, epsilon=epsilon_x_inner) +# +# pw_sym_x = sym.Piecewise( +# (mollifier_handle(x), x**2 < epsilon_x_outer**2), +# (0, True) +# ) +# pw_sym_y = sym.Piecewise( +# (mollifier_handle(y), y**2 < epsilon_y_outer**2), +# (0, True) +# ) +# +# def mollifier2d(x, y, epsilon): +# """ one d mollifier """ +# out_expr = sym.exp(-1/(1-(x**2 + y**2)/epsilon**2) + 1) +# return out_expr +# +# mollifier2d_handle = ft.partial(mollifier2d, epsilon=epsilon_x_outer) +# +# pw_sym2d_x = sym.Piecewise( +# (mollifier2d_handle(x, y), x**2 + y**2 < epsilon_x_outer**2), +# (0, True) +# ) +# +# zero_on_epsilon_shrinking_of_subdomain = sym.Piecewise( +# (mollifier_handle(sym.sqrt(x**2 + y**2)+2*epsilon_x_inner), ((-2*epsilon_x_inner<sym.sqrt(x**2 + y**2)) & (sym.sqrt(x**2 + y**2)<-epsilon_x_inner))), +# (0, ((-epsilon_x_inner<=sym.sqrt(x**2 + y**2)) & (sym.sqrt(x**2 + y**2)<=epsilon_x_inner))), +# (mollifier_handle(sym.sqrt(x**2 + y**2)-2*epsilon_x_inner), ((epsilon_x_inner<sym.sqrt(x**2 + y**2)) & (sym.sqrt(x**2 + y**2)<2*epsilon_x_inner))), +# (1, True), +# ) +# +# zero_on_epsilon_shrinking_of_subdomain_x = sym.Piecewise( +# (mollifier_handle(x+2*epsilon_x_inner), ((-2*epsilon_x_inner<x) & (x<-epsilon_x_inner))), +# (0, ((-epsilon_x_inner<=x) & (x<=epsilon_x_inner))), +# (mollifier_handle(x-2*epsilon_x_inner), ((epsilon_x_inner<x) & (x<2*epsilon_x_inner))), +# (1, True), +# ) +# +# zero_on_epsilon_shrinking_of_subdomain_y = sym.Piecewise( +# (1, y<=-2*epsilon_x_inner), +# (mollifier_handle(y+2*epsilon_x_inner), ((-2*epsilon_x_inner<y) & (y<-epsilon_x_inner))), +# (0, ((-epsilon_x_inner<=y) & (y<=epsilon_x_inner))), +# (mollifier_handle(y-2*epsilon_x_inner), ((epsilon_x_inner<y) & (y<2*epsilon_x_inner))), +# (1, True), +# ) +# +# zero_on_shrinking = zero_on_epsilon_shrinking_of_subdomain #zero_on_epsilon_shrinking_of_subdomain_x + zero_on_epsilon_shrinking_of_subdomain_y +# gaussian = pw_sym2d_x# pw_sym_y*pw_sym_x +# cutoff = gaussian/(gaussian + zero_on_shrinking) +# +# +# sat_sym = { +# 1: 0.5 + 0.25*sym.sin(x-t)*sym.cos(y-t), +# 2: 0.5 + 0.25*sym.sin(x-t)*sym.cos(y-t) +# } +# +# Spc = { +# 1: sym.Piecewise((pc_saturation_sym[1](sat_sym[1]), sat_sym[1] > 0), (pc_saturation_sym[1](sat_sym[1]), 1>=sat_sym[1]), (0, True)), +# 2: sym.Piecewise((pc_saturation_sym[2](sat_sym[2]), sat_sym[2] > 0), (pc_saturation_sym[2](sat_sym[2]), 2>=sat_sym[2]), (0, True)) +# } +# +# p1w = (-1 - (1+t*t)*(1 + x*x + y*y))#*cutoff +# p2w = p1w +# p_e_sym = { +# 1: {'wetting': p1w, +# 'nonwetting': (p1w + Spc[1])}, #*cutoff}, +# 2: {'wetting': p2w, +# 'nonwetting': (p2w + Spc[2])}, #*cutoff}, +# } + +p_e_sym = { + 1: {'wetting': (-6 - (1+t*t)*(1 + x*x + (0.6-y)**2)), #*cutoff, + 'nonwetting': (-1 -t*(1.1+ 0.6-y + x**2))}, #*(sym.sin((1+y)/2*sym.pi)*sym.sin((1+x)/2*sym.pi))**2}, + 2: {'wetting': (-6 - (1+t*t)*(1 + x*x + (0.6-y)**2)), #*(sym.sin((1+y)/2*sym.pi)*sym.sin((1+x)/2*sym.pi))**2, + 'nonwetting': (-1 -t*(1.1+ 0.6-y + x**2))}, #*(sym.sin((1+y)/2*sym.pi)*sym.sin((1+x)/2*sym.pi))**2}, + # 1: {'wetting': (-5 - (1+t*t)*(1 + x*x + y*y)), #*cutoff, + # 'nonwetting': (-1 -t*(1.1+y + x**2))}, #*cutoff}, + # 2: {'wetting': (-5 - (1+t*t)*(1 + x*x + y*y)), #*cutoff, + # 'nonwetting': (-1 -t*(1.1+y + x**2))}, #*cutoff}, +} + + +pc_e_sym = dict() +for subdomain, isR in isRichards.items(): + if isR: + pc_e_sym.update({subdomain: -p_e_sym[subdomain]['wetting']}) + else: + pc_e_sym.update({subdomain: p_e_sym[subdomain]['nonwetting'] + - p_e_sym[subdomain]['wetting']}) + + + +exact_solution_example = hlp.generate_exact_solution_expressions( + symbols=symbols, + isRichards=isRichards, + symbolic_pressure=p_e_sym, + symbolic_capillary_pressure=pc_e_sym, + saturation_pressure_relationship=S_pc_sym, + saturation_pressure_relationship_prime=S_pc_sym_prime, + viscosity=viscosity,# + porosity=porosity, + relative_permeability=relative_permeability,# + relative_permeability_prime=ka_prime, + densities=densities,# + gravity_acceleration=gravity_acceleration, + include_gravity=include_gravity, + ) +source_expression = exact_solution_example['source'] +exact_solution = exact_solution_example['exact_solution'] +initial_condition = exact_solution_example['initial_condition'] + +# Dictionary of dirichlet boundary conditions. +dirichletBC = dict() +# similarly to the outer boundary dictionary, if a patch has no outer boundary +# None should be written instead of an expression. +# This is a bit of a brainfuck: +# dirichletBC[ind] gives a dictionary of the outer boundaries of subdomain ind. +# Since a domain patch can have several disjoint outer boundary parts, the +# expressions need to get an enumaration index which starts at 0. +# So dirichletBC[ind][j] is the dictionary of outer dirichlet conditions of +# subdomain ind and boundary part j. +# Finally, dirichletBC[ind][j]['wetting'] and dirichletBC[ind][j]['nonwetting'] +# return the actual expression needed for the dirichlet condition for both +# phases if present. + +# subdomain index: {outer boudary part index: {phase: expression}} +for subdomain in isRichards.keys(): + # if subdomain has no outer boundary, outer_boundary_def_points[subdomain] is None + if outer_boundary_def_points[subdomain] is None: + dirichletBC.update({subdomain: None}) + else: + dirichletBC.update({subdomain: dict()}) + # set the dirichlet conditions to be the same code as exact solution on + # the subdomain. + for outer_boundary_ind in outer_boundary_def_points[subdomain].keys(): + dirichletBC[subdomain].update( + {outer_boundary_ind: exact_solution[subdomain]} + ) + + +# def saturation(pressure, subdomain_index): +# # inverse capillary pressure-saturation-relationship +# return df.conditional(pressure < 0, 1/((1 - pressure)**(1/(subdomain_index + 1))), 1) +# +# sa + +write_to_file = { + 'meshes_and_markers': True, + 'L_iterations': True +} + + +# initialise LDD simulation class +simulation = ldd.LDDsimulation( + tol=1E-14, + LDDsolver_tol=solver_tol, + debug=debugflag, + max_iter_num=max_iter_num + ) + +simulation.set_parameters(use_case=use_case, + output_dir=output_string, + subdomain_def_points=subdomain_def_points, + isRichards=isRichards, + interface_def_points=interface_def_points, + outer_boundary_def_points=outer_boundary_def_points, + adjacent_subdomains=adjacent_subdomains, + mesh_resolution=mesh_resolution, + viscosity=viscosity, + porosity=porosity, + L=L, + lambda_param=lambda_param, + relative_permeability=relative_permeability, + saturation=sat_pressure_relationship, + starttime=starttime, + number_of_timesteps=number_of_timesteps, + number_of_timesteps_to_analyse=number_of_timesteps_to_analyse, + timestep_size=timestep_size, + sources=source_expression, + initial_conditions=initial_condition, + dirichletBC_expression_strings=dirichletBC, + exact_solution=exact_solution, + densities=densities, + include_gravity=include_gravity, + write2file=write_to_file, + ) + +simulation.initialise() +# simulation.write_exact_solution_to_xdmf() +simulation.run(analyse_condition=analyse_condition) diff --git a/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-horizontal-interface-avoiding-origin.py b/Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-horizontal-interface-avoiding-origin.py similarity index 100% rename from TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-horizontal-interface-avoiding-origin.py rename to Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-horizontal-interface-avoiding-origin.py diff --git a/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-tilted-interface/TP-TP-2-patch-pure-dd-horizontal-tilted-interface-avoiding-origin.py b/Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-tilted-interface/TP-TP-2-patch-pure-dd-horizontal-tilted-interface-avoiding-origin.py similarity index 100% rename from TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-tilted-interface/TP-TP-2-patch-pure-dd-horizontal-tilted-interface-avoiding-origin.py rename to Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/TP-TP-2-patch-pure-dd-tilted-interface/TP-TP-2-patch-pure-dd-horizontal-tilted-interface-avoiding-origin.py diff --git a/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/corner_subdomains/TP-TP-4-patch-pure-dd-corner_subdomains-avoiding-origin.py b/Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/corner_subdomains/TP-TP-4-patch-pure-dd-corner_subdomains-avoiding-origin.py similarity index 100% rename from TP-TP-2-patch-pure-dd-avoid-interface-at-origin/corner_subdomains/TP-TP-4-patch-pure-dd-corner_subdomains-avoiding-origin.py rename to Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/corner_subdomains/TP-TP-4-patch-pure-dd-corner_subdomains-avoiding-origin.py diff --git a/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/mesh_study_convergence/TP-TP-2-patch-pure-dd-convergence-study.py b/Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/mesh_study_convergence/TP-TP-2-patch-pure-dd-convergence-study.py similarity index 100% rename from TP-TP-2-patch-pure-dd-avoid-interface-at-origin/mesh_study_convergence/TP-TP-2-patch-pure-dd-convergence-study.py rename to Two-phase-Two-phase/two-patch/TP-TP-2-patch-pure-dd-avoid-interface-at-origin/mesh_study_convergence/TP-TP-2-patch-pure-dd-convergence-study.py diff --git a/TP-TP-2-patch-test-case/TP-TP-2-patch-alterantive.py b/Two-phase-Two-phase/two-patch/TP-TP-2-patch-test-case/TP-TP-2-patch-alterantive.py similarity index 100% rename from TP-TP-2-patch-test-case/TP-TP-2-patch-alterantive.py rename to Two-phase-Two-phase/two-patch/TP-TP-2-patch-test-case/TP-TP-2-patch-alterantive.py diff --git a/TP-TP-2-patch-test-case/TP-TP-2-patch-test.py b/Two-phase-Two-phase/two-patch/TP-TP-2-patch-test-case/TP-TP-2-patch-test.py similarity index 100% rename from TP-TP-2-patch-test-case/TP-TP-2-patch-test.py rename to Two-phase-Two-phase/two-patch/TP-TP-2-patch-test-case/TP-TP-2-patch-test.py diff --git a/TP-TP-patch-test-case/TP-TP-2-patch-test.py b/Two-phase-Two-phase/two-patch/archive/TP-TP-patch-test-case/TP-TP-2-patch-test.py similarity index 100% rename from TP-TP-patch-test-case/TP-TP-2-patch-test.py rename to Two-phase-Two-phase/two-patch/archive/TP-TP-patch-test-case/TP-TP-2-patch-test.py diff --git a/layered-soil-case/layered_soil.py b/layered-soil-case/layered_soil.py deleted file mode 100755 index 952d6e6..0000000 --- a/layered-soil-case/layered_soil.py +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/python3 -"""This program sets up a domain together with a decomposition into subdomains -modelling layered soil. This is used for our LDD article with tp-tp and tp-r -coupling. - -Along with the subdomains and the mesh domain markers are set upself. -The resulting mesh is saved into files for later use. -""" - -#!/usr/bin/python3 -import dolfin as df -import mshr -import numpy as np -import sympy as sym -import typing as tp -import domainPatch as dp -import LDDsimulation as ldd - -# global domain -subdomain0_vertices = [df.Point(0.0,0.0), # - df.Point(13.0,0.0),# - df.Point(13.0,8.0),# - df.Point(0.0,8.0)] - -interface12_vertices = [df.Point(0.0, 7.0), - df.Point(9.0, 7.0), - df.Point(10.5, 7.5), - df.Point(12.0, 7.0), - df.Point(13.0, 6.5)] -# subdomain1. -subdomain1_vertices = [interface12_vertices[0], - interface12_vertices[1], - interface12_vertices[2], - interface12_vertices[3], - interface12_vertices[4], # southern boundary, 12 interface - df.Point(13.0, 8.0), # eastern boundary, outer boundary - df.Point(0.0, 8.0) ] # northern boundary, outer on_boundary - -# interface23 -interface23_vertices = [df.Point(0.0, 5.0), - df.Point(3.0, 5.0), - df.Point(6.5, 4.5), - df.Point(9.5, 5.0), - df.Point(11.5, 3.5), - df.Point(13.0, 3)] - -#subdomain1 -subdomain2_vertices = [interface23_vertices[0], - interface23_vertices[1], - interface23_vertices[2], - interface23_vertices[3], - interface23_vertices[4], - interface23_vertices[5], # southern boundary, 23 interface - subdomain1_vertices[4], # eastern boundary, outer boundary - subdomain1_vertices[3], - subdomain1_vertices[2], - subdomain1_vertices[1], - subdomain1_vertices[0] ] # northern boundary, 12 interface - -# interface34 -interface34_vertices = [df.Point(0.0, 2.0), - df.Point(4.0, 2.0), - df.Point(9.0, 2.5), - df.Point(10.5, 2.0), - df.Point(13.0, 1.5)] - -# subdomain3 -subdomain3_vertices = [interface34_vertices[0], - interface34_vertices[1], - interface34_vertices[2], - interface34_vertices[3], - interface34_vertices[4], # southern boundary, 34 interface - subdomain2_vertices[5], # eastern boundary, outer boundary - subdomain2_vertices[4], - subdomain2_vertices[3], - subdomain2_vertices[2], - subdomain2_vertices[1], - subdomain2_vertices[0] ] # northern boundary, 23 interface - -# subdomain4 -subdomain4_vertices = [df.Point(0.0, 0.0), - df.Point(13.0, 0.0), # southern boundary, outer boundary - subdomain3_vertices[4],# eastern boundary, outer boundary - subdomain3_vertices[3], - subdomain3_vertices[2], - subdomain3_vertices[1], - subdomain3_vertices[0] ] # northern boundary, 34 interface - -subdomain_vertices = [subdomain0_vertices,# - subdomain1_vertices,# - subdomain2_vertices,# - subdomain3_vertices,# - subdomain4_vertices] -# subdomain_vertices = [subdomain0_vertices,# -# subdomain1_vertices,# -# subdomain2_vertices] - - -# interface_vertices introduces a global numbering of interfaces. -interface_vertices = [interface12_vertices, interface23_vertices, interface34_vertices] -adjacent_subdomains = [[1,2], [2,3], [3,4]] -# adjacent_subdomains = [[1,2]] -# interface_vertices = [interface12_vertices] -# initialise LDD simulation class -simulation = ldd.LDDsimulation() -simulation._init_meshes_and_markers(subdomain_vertices, mesh_resolution=2) -# subdomain marker functions -domain_marker = simulation.domain_marker -mesh_subdomain = simulation.mesh_subdomain -simulation._init_interfaces(interface_vertices, adjacent_subdomains) - -interface = simulation.interface -interface_marker = simulation.interface_marker - - -# Save mesh to file -df.File('./domain_layered_soil.xml.gz') << mesh_subdomain[0] -df.File('./global_interface_marker.pvd') << interface_marker -#df.File('./subdomain1.xml.gz') << mesh_subdomain -df.File('./domain_markers.pvd') << domain_marker -#df.File('./subdomain_boundary_markers.pvd') << subdomain_boundary_marker - - - -# Save sub domains to file -#file = File("subdomains_layered_soil.xml") -#file << subdomains - -#file_double = File("subdomains_double.xml") -#file_double << subdomains_double - -# Save sub domains to VTK files -#file = File("subdomains_layered_soil.pvd") -#file << subdomains -- GitLab