From bdbf754d6be776a665a092b99034b029f06d6c4c Mon Sep 17 00:00:00 2001 From: Pietro Monticone <38562595+pitmonticone@users.noreply.github.com> Date: Sat, 25 Mar 2023 02:29:16 +0100 Subject: [PATCH] Fix a few typos --- doc/dev.rst | 2 +- doc/index.rst | 2 +- doc/prereqs.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/dev.rst b/doc/dev.rst index e18b955..7ff23ad 100644 --- a/doc/dev.rst +++ b/doc/dev.rst @@ -29,4 +29,4 @@ Tips and tricks Looking at changes in output ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -`git diff --word-diff-regex="[^\",]+"` will show you differences in csv files on the output level (quote and delimter) (see `https://resonantecho.net/software/git/2018/03/29/git-word-diff.html#:~:text=It%20does%20this%20by%20having,word%2Ddiff%2Dregex%3D `_.) for more details) +`git diff --word-diff-regex="[^\",]+"` will show you differences in csv files on the output level (quote and delimiter) (see `https://resonantecho.net/software/git/2018/03/29/git-word-diff.html#:~:text=It%20does%20this%20by%20having,word%2Ddiff%2Dregex%3D `_.) for more details) diff --git a/doc/index.rst b/doc/index.rst index ab48a40..986043a 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -69,7 +69,7 @@ The page :doc:`code` provides detailed description of the command line interface (CLI), that can be used from e.g. an Anaconda prompt, and descriptions of specific functions for infilling, harmonization, climate emulator runs, and post-processing. -The page :doc:`emulator` provdies more detail and instructions on how the climate +The page :doc:`emulator` provides more detail and instructions on how the climate emulators FaIR, CICERO-SCM, and MAGICC are coupled to this workflow, where to download additional files, and how to set up emulators for running. diff --git a/doc/prereqs.rst b/doc/prereqs.rst index 25c3e7b..821b25b 100644 --- a/doc/prereqs.rst +++ b/doc/prereqs.rst @@ -22,7 +22,7 @@ take up to one hour on a personal computer. For running scenario sets bigger tha about 10-20 scenarios, you require more computing power. While MAGICC7 and CICERO-SCM mostly benefit from more cores, FaIR especially requires more RAM. -Tuning parallellisation settings for your specific setup currently requires +Tuning parallelisation settings for your specific setup currently requires delving into the code, editing ``joblib`` settings, and re-installing (e.g. with ``pip install -e .``).