Merge remote-tracking branch 'upstream/master' into develop

Author: arbennett

README.md

@@ -109,6 +109,12 @@ number given after the `-n` flag is the number of processes to run. A
 good rule of thumb is to use one less process than the number of
 processsors (or threads) that the machine you are running on has.
 
+:exclamation: Users in environments where OpenMP is available may experience
+over-utilization of CPU resources, leading to lower performance. If you experience
+this issue try setting the `OMP_NUM_THREADS` environment variable to 1 before running
+MetSim.. This can be done in bash and similar shells by running
+`export OMP_NUM_THREADS=1`.
+
 References
 ==========
 

docs/index.rst

@@ -113,6 +113,14 @@ after the ``-n`` flag is the number of processes to run. A good rule of thumb is
 to use one less process than the number of processsors (or threads) that the
 machine you are running on has.
 
+.. warning::
+    Users in environments where OpenMP is available may experience
+    over-utilization of CPU resources, leading to lower performance. If you experience
+    this issue try setting the `OMP_NUM_THREADS` environment variable to 1 before running
+    MetSim.. This can be done in bash and similar shells by running
+    `export OMP_NUM_THREADS=1`.
+
+
 References
 ==========