From aff576d276919a89c4151630295f1cfa4c3a7e48 Mon Sep 17 00:00:00 2001 From: Cian Wilson Date: Mon, 24 Apr 2023 12:40:20 -0400 Subject: [PATCH] Squashed 'global_subduction_suite/' changes from 3a20669..6aad581 6aad581 Consistently name the tex output for the comparison plots. da306f0 Merge commit 'a1777fdca1df13cd82ba8ff7e07b1db9ec671cac' 6abed4a Correction to URL in README.md git-subtree-dir: global_subduction_suite git-subtree-split: 6aad581d01c145fe349e3f412d23406645e7958c --- README.md | 2 +- scripts/generate_latex_diffs.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index aa17712..09b8b87 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Additionally supplementary files are included for the geometry and the sediment The following instructions assume an active installation of TerraFERMA (the Transparent Finite ELement Rapid Model Assembler). If one is not available the consider using the docker image provided for this directory at: -https://github.com/users/cianwilson/packages/container/package/vankeken\_wilson\_peps\_2023 +https://github.com/users/cianwilson/packages/container/package/vankeken_wilson_peps_2023 This docker image contains a complete installation of TerraFERMA and its dependencies, PETSc, FEniCS and SPuD, within an Ubuntu 20.04LTS OS. For a full description of TerraFERMA please refer to the webpage: diff --git a/scripts/generate_latex_diffs.py b/scripts/generate_latex_diffs.py index a4272e5..4f6f328 100755 --- a/scripts/generate_latex_diffs.py +++ b/scripts/generate_latex_diffs.py @@ -22,7 +22,7 @@ minres='1.0' cfl='1.0' -repodir = os.path.join(os.path.dirname(__file__), os.path.pardir) +repodir = os.path.relpath(os.path.join(os.path.dirname(__file__), os.path.pardir)) subdirs = sorted([os.path.basename(d) for d in glob.glob(os.path.join(repodir, '??_*'))]) for subdir in subdirs: subpath = os.path.join(repodir, subdir, 'subduction_linearized_p2p1p2.tfml.run', 'Dc_80.0', 'minres_'+minres, 'cfl_'+cfl, 'run_0') @@ -40,7 +40,7 @@ \\end{document}""".split(os.linesep) -with open(os.path.join('all_temperature_diffs.tex'), 'w') as f: +with open(os.path.join('Figures_comp_D80new_TF-Sepran_all.tex'), 'w') as f: f.write(os.linesep.join(output))