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
Show file tree
Hide file tree
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
starting to work on mean climate
  • Loading branch information
gleckler1 committed Feb 2, 2021
commit 1c49f1cf43b2030c942c5f40ac05a5bc224f31b9
2 changes: 1 addition & 1 deletion docs/Supporting-data.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

<p class="caption"><span class="caption-text">Contents:</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="Technical-overview.html">Technical Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="Technical-overview.html">Usage Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="install.html">Install using Anaconda</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="#">Retrieving data for demos and use of the PMP</a></li>
<li class="toctree-l1"><a class="reference internal" href="metrics-overview.html">Documentation and Demos</a></li>
Expand Down
21 changes: 11 additions & 10 deletions docs/Technical-overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Technical Overview &mdash; PCMDI Metrics 1.2.1 documentation</title>
<title>Usage Overview &mdash; PCMDI Metrics 1.2.1 documentation</title>



Expand Down Expand Up @@ -36,7 +36,7 @@

<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
<link rel="next" title="Retrieving data for demos and use of the PMP" href="Supporting-data.html" />
<link rel="next" title="Install using Anaconda" href="install.html" />
<link rel="prev" title="PCMDI Metrics Package (PMP)" href="index.html" />
</head>

Expand Down Expand Up @@ -84,7 +84,7 @@

<p class="caption"><span class="caption-text">Contents:</span></p>
<ul class="current">
<li class="toctree-l1 current"><a class="current reference internal" href="#">Technical Overview</a><ul>
<li class="toctree-l1 current"><a class="current reference internal" href="#">Usage Overview</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#summary">Summary</a><ul>
<li class="toctree-l3"><a class="reference internal" href="#software-framework-and-dependancies">Software framework and dependancies</a></li>
<li class="toctree-l3"><a class="reference internal" href="#input-output-format">Input/Output format</a></li>
Expand All @@ -93,6 +93,7 @@
</li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="install.html">Install using Anaconda</a></li>
<li class="toctree-l1"><a class="reference internal" href="Supporting-data.html">Retrieving data for demos and use of the PMP</a></li>
<li class="toctree-l1"><a class="reference internal" href="metrics-overview.html">Documentation and Demos</a></li>
<li class="toctree-l1"><a class="reference internal" href="pmpparser.html">Miscellaneous</a></li>
Expand Down Expand Up @@ -142,7 +143,7 @@

<li><a href="index.html" class="icon icon-home"></a> &raquo;</li>

<li>Technical Overview</li>
<li>Usage Overview</li>


<li class="wy-breadcrumbs-aside">
Expand All @@ -161,8 +162,8 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http:https://schema.org/Article">
<div itemprop="articleBody">

<div class="section" id="technical-overview">
<h1>Technical Overview<a class="headerlink" href="#technical-overview" title="Permalink to this headline">¶</a></h1>
<div class="section" id="usage-overview">
<h1>Usage Overview<a class="headerlink" href="#usage-overview" title="Permalink to this headline">¶</a></h1>
<div class="section" id="summary">
<h2>Summary<a class="headerlink" href="#summary" title="Permalink to this headline">¶</a></h2>
<p>The PMP provides a diverse suite of analysis utilities each of which produce summary statistics that gauge the consistency between climate model simulations and available observations. The primary application of the PMP is to evaluate simulations from the <a class="reference external" href="https://www.wcrp-climate.org/wgcm-cmip">Coupled Model Intercomparison Project (CMIP)</a>. It can also be used to provide objective performance summaries during the model development process as well as selected research purposes. The notes below provide a brief summary of some of the key aspects of the PMP design.</p>
Expand All @@ -177,17 +178,17 @@ <h3>Input/Output format<a class="headerlink" href="#input-output-format" title="
</div>
<div class="section" id="basic-operation">
<h3>Basic Operation<a class="headerlink" href="#basic-operation" title="Permalink to this headline">¶</a></h3>
<p>The summary statistics available with the PMP can be run independently or as a collective (the later to be available via the next PMP version). Here is a glimpse of how the mean climate statistics are executed from the unix command prompt ($):</p>
<p>The summary statistics available with the PMP can be run independently or as a collective (the later to be available via the next PMP version). Here is a glimpse of how the mean climate statistics are executed from the unix command prompt:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>$ mean_climate_driver.py -p e3sm_parameterfile.py
</pre></div>
</div>
<p>Because there are often multiple parameters to set before executing a PMP code, routine operation often involves setting these options in an “input parameter” python file such as the filename immediately following the “-p” flag above. The PMP input parameter files are similiar to a “namelist” text file used in other climate analysis packages but having the input parameters set in a python file enables us to leverage the power of python. For example, the contents of an input parameter file might look something like this ($):</p>
<p>Because there are often multiple parameters to set before executing a PMP code, routine operation often involves setting these options in an “input parameter” python file such as the filename immediately following the “-p” flag above. The PMP input parameter files are similiar to a “namelist” text file used in other climate analysis packages but having the input parameters set in a python file enables us to leverage the power of python. For example, the contents of an input parameter file might look something like this:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>$ more input_parameters.py
$ test_data_set = [&#39;ACCESS-1-0&#39;,&#39;CESM2&#39;]
$ period = &#39;1981-2005&#39;
</pre></div>
</div>
<p>which includes both a string variable (period) and a python list (test_data_set). Other python objects can be included in input parameter files, notably python dictionaries. Additional functionality is shown in another example command ($):</p>
<p>which includes both a string variable (period) and a python list (test_data_set). Other python objects can be included in input parameter files, notably python dictionaries. Additional functionality is shown in another example command:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>$ mean_climate_driver.py -p e3sm_parameterfile.py --variable pr
</pre></div>
</div>
Expand All @@ -205,7 +206,7 @@ <h3>Basic Operation<a class="headerlink" href="#basic-operation" title="Permalin

<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">

<a href="Supporting-data.html" class="btn btn-neutral float-right" title="Retrieving data for demos and use of the PMP" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="install.html" class="btn btn-neutral float-right" title="Install using Anaconda" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>


<a href="index.html" class="btn btn-neutral float-left" title="PCMDI Metrics Package (PMP)" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
Expand Down
18 changes: 9 additions & 9 deletions docs/_sources/Technical-overview.rst.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Technical Overview
Usage Overview
***********

Summary
Expand All @@ -23,19 +23,19 @@ The PMP statistics are output in `JSON format <https://www.json.org/json-en.html
Basic Operation
---------------

The summary statistics available with the PMP can be run independently or as a collective (the later to be available via the next PMP version). Here is a glimpse of how the mean climate statistics are executed from the unix command prompt ($): ::
The summary statistics available with the PMP can be run independently or as a collective (the later to be available via the next PMP version). Here is a glimpse of how the mean climate statistics are executed from the unix command prompt: ::

$ mean_climate_driver.py -p e3sm_parameterfile.py
$ mean_climate_driver.py -p e3sm_parameterfile.py

Because there are often multiple parameters to set before executing a PMP code, routine operation often involves setting these options in an "input parameter" python file such as the filename immediately following the "-p" flag above. The PMP input parameter files are similiar to a "namelist" text file used in other climate analysis packages but having the input parameters set in a python file enables us to leverage the power of python. For example, the contents of an input parameter file might look something like this ($): ::
Because there are often multiple parameters to set before executing a PMP code, routine operation often involves setting these options in an "input parameter" python file such as the filename immediately following the "-p" flag above. The PMP input parameter files are similiar to a "namelist" text file used in other climate analysis packages but having the input parameters set in a python file enables us to leverage the power of python. For example, the contents of an input parameter file might look something like this: ::

$ more input_parameters.py
$ test_data_set = ['ACCESS-1-0','CESM2']
$ period = '1981-2005'
$ more input_parameters.py
$ test_data_set = ['ACCESS-1-0','CESM2']
$ period = '1981-2005'

which includes both a string variable (period) and a python list (test_data_set). Other python objects can be included in input parameter files, notably python dictionaries. Additional functionality is shown in another example command ($): ::
which includes both a string variable (period) and a python list (test_data_set). Other python objects can be included in input parameter files, notably python dictionaries. Additional functionality is shown in another example command: ::

$ mean_climate_driver.py -p e3sm_parameterfile.py --variable pr
$ mean_climate_driver.py -p e3sm_parameterfile.py --variable pr

Here, the "---variable" option is used to specify "pr" (precipitation) with other options included in the file after the "-p" flag.

Expand Down
2 changes: 1 addition & 1 deletion docs/_sources/index.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ GETTING STARTED
===============
Installation requirements and instructions are available on the :ref:`install` page

An overview for using the package and template scripts are detailed on the :ref:`metrics-overview` page
An overview of the summary statistics available via the package are summarized with interactive Jupyter notebooks in the :ref:`metrics-overview` page

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

Expand Down
36 changes: 34 additions & 2 deletions docs/_sources/mean-climate.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,43 @@ The mean climate summary statistics are some of the most routine analysis availa
Observational climatologies
###########################

A database of `observational climatologies <https://github.com/PCMDI/PCMDIobs-cmor-tables/blob/master/catalogue/pcmdiobs2_clims_byVar_catalogue_v20201210.json>`_ is available to users of the PMP. To obtain this, please contact the PMP user group ([email protected]) and you will promptly provided with the database. A subset of this database is available via the demo data made available for the PMP tutorials via a `jupyter notebook demo <https://github.com/PCMDI/pcmdi_metrics/blob/master/doc/jupyter/Demo/Demo_0_download_data.ipynb>`_ or via the version of python included as part of the PMP environment.
A database of `observational climatologies <https://github.com/PCMDI/PCMDIobs-cmor-tables/blob/master/catalogue/pcmdiobs2_clims_byVar_catalogue_v20201210.json>`_ is available to users of the PMP. To obtain this, please contact the PMP user group ([email protected]) and you will be promptly provided with the database. A subset of this database is available via the demo data made available for the PMP tutorials via a `jupyter notebook demo <https://github.com/PCMDI/pcmdi_metrics/blob/master/doc/jupyter/Demo/Demo_0_download_data.ipynb>`_. Once you have downloaded this demo data you can interactively run the mean climate and other demos.

The `mean climate notebook <https://github.com/PCMDI/pcmdi_metrics/blob/master/doc/jupyter/Demo/Demo_1_mean_climate.ipynb>`_ provides a series of examples that demonstrate the options available.

Preparation of model climatologies
##################################

Sample model climatologies are available as part of the PMP demo database noted above and are used for the mean climate notebook. However, if a user wants to create and use their own model climatologies the a simple example is provide in the mean climate notebook itself or the `PMP github repository <https://github.com/PCMDI/pcmdi_metrics/tree/master/sample_setups/pcmdi_parameter_files/mean_climate/make_clims>`_.


Construction of an input paramater file
#######################################

The PMP mean climate metrics can be controlled via an input parameter file, the command line, or both. With the command line only it is executed via: ::


mean_climate_driver.py -p basic_param.py

or as a combination of an input parameter file and the command line, e.g.: ::

mean_climate_driver.py -p basic_param.py --vars rlut pr

where the list of variables to run the analysis on includes the variables 'rlut' (outgoing TOA longwave radiation) and 'pr' (precipitation).

Because there are a minimum of 5(?) parameters to be set with the mean climate statistics.

SOME DISCUSSION HERE ON THE MINIMUM SET OF INPUT PARAMETERS.




In addition to the minimum set of parameters noted above, the following summarizes additional options than can be controlled for the mean climate:


* Select regridding option
* Define a different set of regions
* Provide or estimate a land-sea mask
* Define regional masking (e.g., land-only or ocean-only)
* Select to output (or not) interpolate climatologies including masking


2 changes: 1 addition & 1 deletion docs/_sources/metrics-overview.rst.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. _using-the-package:
.. _metrics-overview:

*****************
Documentation and Demos
Expand Down
3 changes: 2 additions & 1 deletion docs/clivar-enso-metrics.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@

<p class="caption"><span class="caption-text">Contents:</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="Technical-overview.html">Technical Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="Technical-overview.html">Usage Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="install.html">Install using Anaconda</a></li>
<li class="toctree-l1"><a class="reference internal" href="Supporting-data.html">Retrieving data for demos and use of the PMP</a></li>
<li class="toctree-l1 current"><a class="reference internal" href="metrics-overview.html">Documentation and Demos</a><ul class="current">
<li class="toctree-l2 current"><a class="reference internal" href="metrics-overview.html#overview">Overview</a><ul class="current">
Expand Down
2 changes: 1 addition & 1 deletion docs/extrop-mov.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

<p class="caption"><span class="caption-text">Contents:</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="Technical-overview.html">Technical Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="Technical-overview.html">Usage Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="install.html">Install using Anaconda</a></li>
<li class="toctree-l1"><a class="reference internal" href="Supporting-data.html">Retrieving data for demos and use of the PMP</a></li>
<li class="toctree-l1 current"><a class="reference internal" href="metrics-overview.html">Documentation and Demos</a><ul class="current">
Expand Down
2 changes: 1 addition & 1 deletion docs/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

<p class="caption"><span class="caption-text">Contents:</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="Technical-overview.html">Technical Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="Technical-overview.html">Usage Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="install.html">Install using Anaconda</a></li>
<li class="toctree-l1"><a class="reference internal" href="Supporting-data.html">Retrieving data for demos and use of the PMP</a></li>
<li class="toctree-l1"><a class="reference internal" href="metrics-overview.html">Documentation and Demos</a></li>
Expand Down
Loading