Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <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 <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)
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion doc/prereqs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 .``).

Expand Down