-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #760 from MPAS-Dev/develop
Merge develop to master
- Loading branch information
Showing
58 changed files
with
2,669 additions
and
563 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -93,3 +93,6 @@ ENV/ | |
| .ropeproject | ||
|
|
||
| .DS_Store | ||
|
|
||
| # Anvil test suite | ||
| /anvil_test_suite/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| [runs] | ||
| ## options related to the run to be analyzed and control runs to be | ||
| ## compared against | ||
|
|
||
| # mainRunName is a name that identifies the simulation being analyzed. | ||
| mainRunName = QU480 | ||
|
|
||
| # config file for a control run to which this run will be compared. The | ||
| # analysis should have already been run to completion once with this config | ||
| # file, so that the relevant MPAS climatologies already exist and have been | ||
| # remapped to the comparison grid. Leave this option commented out if no | ||
| # control run is desired. | ||
| # controlRunConfigFile = /path/to/config/file | ||
|
|
||
| # config file for a main run on which the analysis was already run to | ||
| # completion. The relevant MPAS climatologies already exist and have been | ||
| # remapped to the comparison grid and time series have been extracted. | ||
| # Leave this option commented out if the analysis for the main run should be | ||
| # performed. | ||
| # mainRunConfigFile = /path/to/config/file | ||
|
|
||
| [execute] | ||
| ## options related to executing parallel tasks | ||
|
|
||
| # the number of parallel tasks (1 means tasks run in serial, the default) | ||
| parallelTaskCount = 12 | ||
|
|
||
| # the parallelism mode in ncclimo ("serial" or "bck") | ||
| # Set this to "bck" (background parallelism) if running on a machine that can | ||
| # handle 12 simultaneous processes, one for each monthly climatology. | ||
| ncclimoParallelMode = bck | ||
|
|
||
| [diagnostics] | ||
| ## config options related to observations, mapping files and region files used | ||
| ## by MPAS-Analysis in diagnostics computations. | ||
|
|
||
| # The base path to the diagnostics directory. Typically, this will be a shared | ||
| # directory on each E3SM supported machine (see the example config files for | ||
| # its location). For other machines, this would be the directory pointed to | ||
| # when running "download_analysis_data.py" to get the public observations, | ||
| # mapping files and region files. | ||
| baseDirectory = /lcrc/group/acme/diagnostics | ||
|
|
||
| [input] | ||
| ## options related to reading in the results to be analyzed | ||
|
|
||
| # directory containing model results | ||
| baseDirectory = /lcrc/group/acme/ac.xylar/acme_scratch/anvil/20200305.A_WCYCL1850.ne4_oQU480.anvil | ||
|
|
||
| # names of ocean and sea ice meshes (e.g. oEC60to30v3, oQU240v3, oRRS30to10v3, etc.) | ||
| mpasMeshName = oQU480 | ||
|
|
||
| # subdirectory containing restart files | ||
| runSubdirectory = run | ||
| # subdirectory for ocean history files | ||
| oceanHistorySubdirectory = archive/ocn/hist | ||
| # subdirectory for sea ice history files | ||
| seaIceHistorySubdirectory = archive/ice/hist | ||
|
|
||
| # names of namelist and streams files, either a path relative to baseDirectory | ||
| # or an absolute path. | ||
| oceanNamelistFileName = run/mpaso_in | ||
| oceanStreamsFileName = run/streams.ocean | ||
| seaIceNamelistFileName = run/mpassi_in | ||
| seaIceStreamsFileName = run/streams.seaice | ||
|
|
||
| [output] | ||
| ## options related to writing out plots, intermediate cached data sets, logs, | ||
| ## etc. | ||
|
|
||
| # directory where analysis should be written | ||
| baseDirectory = /lcrc/group/acme/ac.xylar/analysis_testing/baseline | ||
|
|
||
| # Anvil doesn't have direct access to a web portal, so output will need | ||
| # to be copied elsewhere (e.g. NERSC web portal) | ||
| htmlSubdirectory = /lcrc/group/acme/public_html/diagnostic_output/ac.xylar/analysis_testing/baseline | ||
|
|
||
| # a list of analyses to generate. Valid names can be seen by running: | ||
| # mpas_analysis --list | ||
| # This command also lists tags for each analysis. | ||
| # Shortcuts exist to generate (or not generate) several types of analysis. | ||
| # These include: | ||
| # 'all' -- all analyses will be run | ||
| # 'all_<tag>' -- all analysis with a particular tag will be run | ||
| # 'all_<component>' -- all analyses from a given component (either 'ocean' | ||
| # or 'seaIce') will be run | ||
| # 'only_<component>', 'only_<tag>' -- all analysis from this component or | ||
| # with this tag will be run, and all | ||
| # analysis for other components or | ||
| # without the tag will be skipped | ||
| # 'no_<task_name>' -- skip the given task | ||
| # 'no_<component>', 'no_<tag>' -- in analogy to 'all_*', skip all analysis | ||
| # tasks from the given compoonent or with | ||
| # the given tag. Do | ||
| # mpas_analysis --list | ||
| # to list all task names and their tags | ||
| # an equivalent syntax can be used on the command line to override this | ||
| # option: | ||
| # mpas_analysis config.analysis --generate \ | ||
| # all,no_ocean,all_timeSeries | ||
| # All tasks with tag "landIceCavities" are disabled because this run did not | ||
| # include land-ice cavities. | ||
| generate = ['all', 'no_BGC', 'no_icebergs', 'no_index', 'no_eke', | ||
| 'no_landIceCavities'] | ||
|
|
||
| [climatology] | ||
| ## options related to producing climatologies, typically to compare against | ||
| ## observations and previous runs | ||
|
|
||
| # the first year over which to average climatalogies | ||
| startYear = 3 | ||
| # the last year over which to average climatalogies | ||
| endYear = 5 | ||
|
|
||
| [timeSeries] | ||
| ## options related to producing time series plots, often to compare against | ||
| ## observations and previous runs | ||
|
|
||
| # start and end years for timeseries analysis. Use endYear = end to indicate | ||
| # that the full range of the data should be used. If errorOnMissing = False, | ||
| # the start and end year will be clipped to the valid range. Otherwise, out | ||
| # of bounds values will lead to an error. In a "control" config file used in | ||
| # a "main vs. control" analysis run, the range of years must be valid and | ||
| # cannot include "end" because the original data may not be available. | ||
| startYear = 1 | ||
| endYear = end | ||
|
|
||
| [index] | ||
| ## options related to producing nino index. | ||
|
|
||
| # start and end years for El Nino 3.4 analysis. Use endYear = end to indicate | ||
| # that the full range of the data should be used. If errorOnMissing = False, | ||
| # the start and end year will be clipped to the valid range. Otherwise, out | ||
| # of bounds values will lead to an error. In a "control" config file used in | ||
| # a "main vs. control" analysis run, the range of years must be valid and | ||
| # cannot include "end" because the original data may not be available. | ||
| startYear = 1 | ||
| endYear = end | ||
|
|
||
| [streamfunctionMOC] | ||
| ## options related to plotting the streamfunction of the meridional overturning | ||
| ## circulation (MOC) | ||
|
|
||
| # Use postprocessing script to compute the MOC? You want this to be True | ||
| # for low-resolution simulations that use GM to parameterize eddies, because | ||
| # the online MOC analysis member currently does not include the bolus velocity | ||
| # in its calculation, whereas the postprocessing script does. | ||
| # NOTE: this is a temporary option that will be removed once the online | ||
| # MOC takes into account the bolus velocity when GM is on. | ||
| usePostprocessingScript = True |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -e | ||
|
|
||
| branch=$(git symbolic-ref --short HEAD) | ||
|
|
||
| rm -rf anvil_test_suite | ||
| rm -rf /lcrc/group/acme/ac.xylar/analysis_testing/${branch} | ||
| rm -rf /lcrc/group/acme/public_html/diagnostic_output/ac.xylar/analysis_testing/${branch} |
Oops, something went wrong.