Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR for only record #949

Closed
wants to merge 82 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
8ae2c3f
test
lee1043 Nov 4, 2020
c2653b3
initial commit
acordonez Nov 4, 2020
19f1c2c
add .nojekyll
acordonez Nov 4, 2020
35c84e2
add rtd theme and other configs
acordonez Nov 4, 2020
3624fed
first pass at text
acordonez Nov 4, 2020
c75dcd0
move doc folder to docs
acordonez Nov 4, 2020
9cc98ba
add build
acordonez Nov 4, 2020
9ace150
move html to docs
acordonez Nov 4, 2020
8a9224d
stop tracking build
acordonez Nov 4, 2020
fc8358f
move html and doctrees
acordonez Nov 4, 2020
989844a
move .nojekyll
acordonez Nov 4, 2020
90b47de
add index
acordonez Nov 5, 2020
c22d749
remove this index
acordonez Nov 5, 2020
4524273
try moving html files to docs
acordonez Nov 5, 2020
a3a684d
remove doc folder
acordonez Nov 9, 2020
d01430a
move .nojekyll
acordonez Nov 9, 2020
9d2282b
Merge branch '648_jwl_documentation' of https://github.com/PCMDI/pcmd…
acordonez Nov 9, 2020
f2464f1
Merge branch '653_ao_newdocs' of https://github.com/acordonez/pcmdi_m…
acordonez Nov 10, 2020
4ca2af7
remove index.md
acordonez Nov 10, 2020
bd96e5a
simple change
gleckler1 Nov 12, 2020
5682adf
folder cleanup and add make github
acordonez Nov 12, 2020
2017754
Merge pull request #655 from acordonez/653_ao_docscleanup
gleckler1 Nov 12, 2020
5e3f7e6
add back obs_info_dictionary file for circleci
acordonez Nov 16, 2020
3379c3f
fix symbolic link
acordonez Nov 16, 2020
8e65f4f
fix symbolic link again
acordonez Nov 16, 2020
610fd98
replace /doc with /docs
acordonez Nov 16, 2020
08ded5a
Merge pull request #656 from PCMDI/653_ao_docs_obs
gleckler1 Nov 17, 2020
327a7ec
Merge pull request #654 from gleckler1/doc_test2_pjg
Nov 18, 2020
b8fd5fb
Add documentation instructions to readme
Nov 20, 2020
dcac299
Small formatting edits
Nov 20, 2020
56d56ab
a few more tests
gleckler1 Nov 24, 2020
c2b6e42
Merge pull request #657 from PCMDI/doc_test2_pjg
gleckler1 Nov 24, 2020
05003c1
still testing
gleckler1 Nov 24, 2020
f3c5b3e
Merge pull request #658 from PCMDI/doc_test2_pjg
gleckler1 Nov 24, 2020
af6857c
tech file added
gleckler1 Nov 24, 2020
7e2c875
Merge pull request #659 from PCMDI/doc_test2_pjg
gleckler1 Nov 24, 2020
0638c54
still learning
gleckler1 Nov 24, 2020
c04f560
still trying
gleckler1 Nov 24, 2020
a6818c3
Merge pull request #660 from PCMDI/doc_test2_pjg
gleckler1 Nov 24, 2020
4932aa0
starting tech intro
gleckler1 Nov 25, 2020
dfd6cac
Merge pull request #661 from PCMDI/doc_test2_pjg
gleckler1 Nov 25, 2020
086692d
only one install page now
gleckler1 Dec 1, 2020
68d20fd
adding new rst files
gleckler1 Dec 1, 2020
066ceae
Merge pull request #662 from PCMDI/doc_test2_pjg
gleckler1 Dec 1, 2020
4cd7db2
updating
gleckler1 Dec 24, 2020
488ece6
retesting
gleckler1 Dec 24, 2020
c5262b3
Merge pull request #666 from PCMDI/doc_test2_pjg
gleckler1 Dec 24, 2020
8e19d0e
back at it
gleckler1 Jan 14, 2021
5cc847f
Merge pull request #672 from PCMDI/doc_test2_pjg
gleckler1 Jan 14, 2021
318036c
minor index changes
gleckler1 Jan 15, 2021
c819c09
Merge pull request #673 from PCMDI/doc_test2_pjg
gleckler1 Jan 15, 2021
05cd461
another test
gleckler1 Jan 16, 2021
d091417
Merge pull request #674 from PCMDI/doc_test2_pjg
gleckler1 Jan 16, 2021
fe3d8f9
adding more bits
gleckler1 Jan 19, 2021
0db6ee0
Merge pull request #675 from PCMDI/doc_test2_pjg
gleckler1 Jan 19, 2021
e267bd6
added new htmls
gleckler1 Jan 19, 2021
bb26ee2
adding again1
gleckler1 Jan 19, 2021
de08f6b
adding again2
gleckler1 Jan 19, 2021
1c70565
updating index
gleckler1 Jan 20, 2021
8015e9e
Merge pull request #676 from PCMDI/doc_test2_pjg
gleckler1 Jan 20, 2021
adc9a41
minor doc updates
gleckler1 Jan 28, 2021
c280ccb
added old install
gleckler1 Jan 28, 2021
a73676e
working on downloads
gleckler1 Jan 29, 2021
0f06b19
updates on downloading data
gleckler1 Feb 1, 2021
e221764
Merge pull request #684 from PCMDI/doc_test2_pjg
gleckler1 Feb 1, 2021
1c49f1c
starting to work on mean climate
gleckler1 Feb 2, 2021
d30a8a2
Merge pull request #685 from PCMDI/doc_test2_pjg
gleckler1 Feb 2, 2021
9154e5a
added mean clim reqd params
gleckler1 Feb 2, 2021
49d62e6
Merge pull request #686 from PCMDI/doc_test2_pjg
gleckler1 Feb 2, 2021
54c325b
minor mean climate edits
gleckler1 Feb 4, 2021
fe608e8
disc of mean options
gleckler1 Feb 4, 2021
58e4de0
Get up-to-date master
gleckler1 Feb 9, 2021
763494d
intro to subdaily precip
gleckler1 Feb 11, 2021
aea1f25
Merge pull request #690 from PCMDI/doc_test2_pjg
gleckler1 Feb 11, 2021
fd2d5f3
mjo and monsoons
gleckler1 Mar 2, 2021
20345fa
Merge pull request #702 from PCMDI/doc_test2_pjg
gleckler1 Mar 2, 2021
fd75abb
fixing mjo
gleckler1 Mar 2, 2021
5e01f5e
Merge pull request #703 from PCMDI/doc_test2_pjg
gleckler1 Mar 2, 2021
484c8e2
pjg testing
Jan 26, 2022
68f5bd8
updating installation on doc pages
Jan 26, 2022
0ff8c48
install info improved
Jan 26, 2022
193e111
update to include mamba install and xcdat
lee1043 Apr 4, 2023
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
Prev Previous commit
Next Next commit
Add documentation instructions to readme
  • Loading branch information
Ana Ordonez committed Nov 20, 2020
commit b8fd5fb6f38d576dff46303969b0aa3f15c96da4
106 changes: 63 additions & 43 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,44 +1,64 @@
<img src="share/pcmdi/PMPLogo_1359x1146px_300dpi.png" width="15%" height="15%" align="right" />
<h5 align="right"></h5>

PCMDI metrics package (PMP)
======
[![stable version](https://img.shields.io/badge/stable%20version-1.2-brightgreen.svg)](https://github.com/PCMDI/pcmdi_metrics/releases/tag/1.2)
![platforms](https://img.shields.io/badge/platforms-linux%20|%20osx-lightgrey.svg)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.809463.svg)](https://doi.org/10.5281/zenodo.809463)
[![Anaconda-Server Badge](https://anaconda.org/pcmdi/pcmdi_metrics/badges/installer/conda.svg)](https://conda.anaconda.org/pcmdi)
[![Anaconda-Server Badge](https://anaconda.org/pcmdi/pcmdi_metrics/badges/downloads.svg)](https://anaconda.org/pcmdi/pcmdi_metrics)
[![CircleCI](https://circleci.com/gh/PCMDI/pcmdi_metrics.svg?style=svg)](https://circleci.com/gh/PCMDI/pcmdi_metrics)
[![Coverage Status](https://coveralls.io/repos/github/PCMDI/pcmdi_metrics/badge.svg)](https://coveralls.io/github/PCMDI/pcmdi_metrics)

The PCMDI metrics package is used to provide "quick-look" objective comparisons of Earth System Models (ESMs) with one another and available observations. Results are produced in the context of all model simulations contributed to CMIP6 and earlier CMIP phases. Among other purposes, this enables modeling groups to evaluate changes during the development cycle in the context of the structural error distribution of the multi-model ensemble. Currently, the comparisons emphasize metrics of large- to global-scale annual cycle and both tropcial and extra-tropical modes of variability. Ongoing work in v1.x development branches include established statistics for ENSO, MJO, regional monsoons, and high frequency characteristics of simulated precipitation.

**PCMDI uses the PMP to produce [quick-look simulation summaries across generations of CMIP](https://cmec.llnl.gov/results/physical.html)**

The metrics package consists of four parts: 1) Analysis software, 2) an observationally-based database of global (or near global, land or ocean) annual cycle climatologies, 3) a database of performance metrics computed for CMIP models and 4) package documentation (in preparation).

The package expects model data to be [CF-compliant](http:https://cfconventions.org/). To successfully use the package some input data "conditioning" may be required. We provide several demo scripts within the package.

Users of the current release (v1.2) will need to contact the PMP developers ([email protected]) to obtain supporting datasets and get started using the package.


GETTING STARTED
gh-pages
This branch hosts the online documentation for the PCMDI Metrics packages.

Instructions for updating documentation:

Checking out and making changes to the docs branch:
---------------------------------------------------

You must be in a conda environment with "sphinx" and "sphinx_rtd_theme" installed
```
git checkout -b gh-pages
git pull origin gh-pages (optional, grab latest updates)
git checkout -b <new branch name>
cd docs
```
The source files are found in pcmdi_metrics/docs/source. There is an index.rst file that is the landing page. If you create a new page, make sure to list it under the toctree in index.rst.

Building for local preview
--------------------------
```
cd pcmdi_metrics/docs
make clean
make html
```
The `make clean` command is optional and deletes the existing docs/build folder, which is populated by `make html`.
To view your changes locally, open pcmdi_metrics/docs/build/html/index.html with a browser. If it does not build as expected, first try running "make clean" before building again.

Build for github
----------------

Installation requirements and instructions are available on the [Install](https://github.com/PCMDI/pcmdi_metrics/wiki/Install-using-Anaconda) page

An overview for using the package and template scripts are detailed on the [Using-the-package](https://github.com/PCMDI/pcmdi_metrics/wiki/Using-the-package) page

Some installation support for CMIP participating modeling groups is available: [email protected]

PMP versions
------------

v1.2 - Tied to CDAT 8.0. Now includes extensive regression testing. New metrics: Diurnal cycle and intermittency of precipitation, Sperber and Wang Monsoon metrics

v1.1.2 - Now managed through Anaconda, and tied to UV-CDAT 2.10. Weights on bias statistic added. Extensive provenance information incorporated into json files.

v1.1 - First public release, emphasizing climatological statistics, with development branches for ENSO and regional monsoon precipitation indices

v1.0 - Prototype version of the PMP

The main difference here is that the web files have to be copied to /docs. There is a command that does builds and copies in one step:
```
cd pcmdi_metrics/docs
make github
```
Alternatively, these are the manual steps to build for github:
```
cd pcmdi_metrics/docs
make clean
make html
cp -r build/html/* .
```
After building, you then have to "git add" all the files you copied from build/html and commit before pushing. This includes \*html, \*inv, and \*js files, along with the _sources and _static folders (which are currently listed in .gitignore, so you have to make sure to add them)
For example:
```
git add source/*rst *html *inv *js _static _sources
git commit -m "your message"
```
Then you can push your changes

Pushing your changes to your fork to preview:
---------------------------------------------
In pcmdi_metrics, set up your fork as a remote:
```
git remote add <remote name> <https://github.com/your_fork_path>
git remote -v
```
Checkout and push your changes:
```
git checkout <branch with changes>
git push <remote name> <branch with changes>
```
Then go to your forked repo on github.com. Go to Settings -> GitHub Pages -> Source. Under source, select the name of the branch you just pushed. Choose /docs as the folder. This will generate a link to your github pages site.

You can also open a pull request from your fork repo, if desired.