From db4e32864360e8bdef5b966831a6da85abb63a1e Mon Sep 17 00:00:00 2001 From: Chiel van Heerwaarden Date: Wed, 27 May 2020 17:02:04 +0200 Subject: [PATCH] Typos and clarifications (#77) * Include the -DUSE_CBOOL, gfortran does not compile otherwise with `-std=f2003` flag. * Corrected a typo in the output to screen and added complete set of needed packages in Readme.md * Refer to dask[array] in the readme for pip users. --- build/Makefile.conf.gfortran | 6 +++--- examples/rfmip-clear-sky/Readme.md | 3 ++- examples/rfmip-clear-sky/stage_files.py | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build/Makefile.conf.gfortran b/build/Makefile.conf.gfortran index a7b85bfec..ff8deddf2 100644 --- a/build/Makefile.conf.gfortran +++ b/build/Makefile.conf.gfortran @@ -9,9 +9,9 @@ export FC = gfortran # # Optimized # -export FCFLAGS = -ffree-line-length-none -m64 -std=f2003 -march=native -O3 +export FCFLAGS = -ffree-line-length-none -m64 -std=f2003 -march=native -O3 -DUSE_CBOOL # # Debugging - -mno-avx is particular to (broken) gcc setups using MacPorts # -export FCFLAGS = -ffree-line-length-none -m64 -std=f2003 -march=native -mno-avx -pedantic -g -fbounds-check -Wall -fbacktrace -finit-real=nan -#export FCFLAGS = -ffree-line-length-none -m64 -std=f2003 -march=native -pedantic -g -fbounds-check -Wall -fbacktrace -finit-real=nan +#export FCFLAGS = -ffree-line-length-none -m64 -std=f2003 -march=native -mno-avx -pedantic -g -fbounds-check -Wall -fbacktrace -finit-real=nan -DUSE_CBOOL +#export FCFLAGS = -ffree-line-length-none -m64 -std=f2003 -march=native -pedantic -g -fbounds-check -Wall -fbacktrace -finit-real=nan -DUSE_CBOOL diff --git a/examples/rfmip-clear-sky/Readme.md b/examples/rfmip-clear-sky/Readme.md index e45178f2b..a2d2323e6 100644 --- a/examples/rfmip-clear-sky/Readme.md +++ b/examples/rfmip-clear-sky/Readme.md @@ -17,4 +17,5 @@ some optional arguments, see `run-rfmip-examples.py -h` answers produced on a Mac with Intel 19 Fortran compiler. Differences are normally within 10-6 W/m2. -The Python scripts require modules `netCDF4`, `numpy`, and `xarray`. +The Python scripts require modules `netCDF4`, `numpy`, `xarray`, and `dask`. +Install with `pip` requires `pip install dask[array]` for the latter. diff --git a/examples/rfmip-clear-sky/stage_files.py b/examples/rfmip-clear-sky/stage_files.py index 72ed54475..e5875f155 100755 --- a/examples/rfmip-clear-sky/stage_files.py +++ b/examples/rfmip-clear-sky/stage_files.py @@ -27,8 +27,8 @@ # # Download the profiles for RFMIP; make the empty output files # -print("Dowloading RFMIP input files") +print("Downloading RFMIP input files") urllib.request.urlretrieve(conds_url, conds_file) -print("Dowloading scripts for generating output templates") +print("Downloading scripts for generating output templates") urllib.request.urlretrieve(templ_scr_url, templ_scr) subprocess.run([sys.executable, templ_scr, "--source_id", "RTE-RRTMGP-181204"])