Skip to content

Rename cice to seaice #326

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 17, 2018
Merged

Rename cice to seaice #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,19 @@ for more details.
* `mpaso.rst.0002-01-01_00000.nc` (or any other mpas-o restart file)
* `streams.ocean`
* `mpas-o_in`
* mpas-cice files:
* `mpascice.hist.am.timeSeriesStatsMonthly.*.nc`
* `mpascice.rst.0002-01-01_00000.nc` (or any other mpas-cice restart
* mpas-seaice files:
* `mpasseaice.hist.am.timeSeriesStatsMonthly.*.nc`
* `mpasseaice.rst.0002-01-01_00000.nc` (or any other mpas-seaice restart
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the time being, I would keep the old filenames in there as well. We can remove them all together when the change to MPAS-seaice is definite.

file)
* `streams.cice`
* `mpas-cice_in`
* `streams.seaice`
* `mpas-seaice_in`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same goes with these.


Note: for older runs, mpas-seaice files will be named:
* `mpascice.hist.am.timeSeriesStatsMonthly.*.nc`
* `mpascice.rst.0002-01-01_00000.nc`
* `streams.cice`
* `mpas-cice_in`

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@milenaveneziani, here are the additions that you requested.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great thanks.


## Purge Old Analysis

Expand Down
7 changes: 7 additions & 0 deletions configs/anvil/config.20170926.FCT2.A_WCYCL1850S.ne30_oECv3.anvil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ mpasMeshName = oEC60to30v3
# placed in the output mappingSubdirectory
mappingDirectory = /lcrc/group/acme/mpas_analysis/mapping

# names of namelist and streams files, either a path relative to baseDirectory
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice

[output]
## options related to writing out plots, intermediate cached data sets, logs,
## etc.
Expand Down
7 changes: 7 additions & 0 deletions configs/cori/config.20171201.default.GMPAS-IAF.T62_oRRS30to10v3wLI.cori-knl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ mpasMeshName = oRRS30to10v3wLI
# placed in the output mappingSubdirectory
mappingDirectory = /global/project/projectdirs/acme/mpas_analysis/mapping

# names of namelist and streams files, either a path relative to baseDirectory
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice

[output]
## options related to writing out plots, intermediate cached data sets, logs,
## etc.
Expand Down
7 changes: 7 additions & 0 deletions configs/edison/config.20170807.beta1.G_oQU240.edison
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ mpasMeshName = oQU240
# placed in the output mappingSubdirectory
# mappingDirectory = /dir/for/mapping/files

# names of namelist and streams files, either a path relative to baseDirectory
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice

[output]
## options related to writing out plots, intermediate cached data sets, logs,
## etc.
Expand Down
7 changes: 7 additions & 0 deletions configs/edison/config.20171102.beta3rc02_1850.ne30_oECv3_ICG.edison
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ mpasMeshName = oEC60to30v3
# placed in the output mappingSubdirectory
mappingDirectory = /global/project/projectdirs/acme/mpas_analysis/mapping

# names of namelist and streams files, either a path relative to baseDirectory
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice

[output]
## options related to writing out plots, intermediate cached data sets, logs,
## etc.
Expand Down
7 changes: 7 additions & 0 deletions configs/edison/config.B_low_res_ice_shelves_1696_JWolfe_layout_Edison
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ mpasMeshName = oEC60to30v3wLI
# placed in the output mappingSubdirectory
mappingDirectory = /global/project/projectdirs/acme/mpas_analysis/mapping

# names of namelist and streams files, either a path relative to baseDirectory
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice

[output]
## options related to writing out plots, intermediate cached data sets, logs,
## etc.
Expand Down
7 changes: 7 additions & 0 deletions configs/lanl/config.20170207.MPAS-SeaIce.QU60km_polar.wolf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ mpasMeshName = QU60
# placed in the output mappingSubdirectory
# mappingDirectory = /dir/for/mapping/files

# names of namelist and streams files, either a path relative to baseDirectory
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice

[output]
## options related to writing out plots, intermediate cached data sets, logs,
## etc.
Expand Down
7 changes: 7 additions & 0 deletions configs/lanl/config.MatchBoth_orig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ mpasMeshName = oEC60to30v3
# placed in the output mappingSubdirectory
mappingDirectory = /turquoise/usr/projects/climate/SHARED_CLIMATE/mpas_analysis/mapping/

# names of namelist and streams files, either a path relative to baseDirectory
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice

[output]
## options related to writing out plots, intermediate cached data sets, logs,
## etc.
Expand Down
7 changes: 7 additions & 0 deletions configs/olcf/config.20170313.beta1.A_WCYCL1850S.ne30_oECv3_ICG.edison
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ mpasMeshName = oEC60to30v3
# placed in the output mappingSubdirectory
mappingDirectory = /lustre/atlas/proj-shared/cli115/mpas_analysis/mapping/

# names of namelist and streams files, either a path relative to baseDirectory
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice

[output]
## options related to writing out plots, intermediate cached data sets, logs,
## etc.
Expand Down
7 changes: 7 additions & 0 deletions configs/olcf/config.GMPAS-IAF_oRRS18to6v3.titan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ mpasMeshName = oRRS18to6v3
# placed in the output mappingSubdirectory
mappingDirectory = /lustre/atlas/proj-shared/cli115/mpas_analysis/mapping

# names of namelist and streams files, either a path relative to baseDirectory
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice

[output]
## options related to writing out plots, intermediate cached data sets, logs,
## etc.
Expand Down
7 changes: 7 additions & 0 deletions configs/theta/config.20171031.tenYearTest.GMPAS-IAF.T62_oEC60to30v3wLI.60layer.theta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ mpasMeshName = oEC60to30v3wLI
# placed in the output mappingSubdirectory
mappingDirectory = /projects/OceanClimate/mpas-analysis_data/mpas_analysis/mapping

# names of namelist and streams files, either a path relative to baseDirectory
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice

[output]
## options related to writing out plots, intermediate cached data sets, logs,
## etc.
Expand Down
11 changes: 6 additions & 5 deletions docs/mpasseaice.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ In order to support all sea=ice analysis tasks from MPAS-Analysis, certain
simulation, need to be enabled.

The following is a list of suggested values for namelist options, typically
found in ``namelist.cice`` or ``mpas-cice_in``::
found in ``namelist.seaice`` or ``mpas-seaice_in`` (or ``mpas-cice_in`` in
older E3SM runs)::

config_AM_timeSeriesStatsMonthly_enable = .true.

Expand All @@ -24,13 +25,13 @@ typically longer before most analysis is useful::
config_run_duration = '0002-00-00_00:00:00'

Several streams must be defined in the streams file, typically
``streams.cice``, (even if they will not be written out --
``output_interval=="none"``)::
``streams.seaice`` or ``streams.cice`` in older E3SM runs, (even if they will
not be written out -- ``output_interval=="none"``)::
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@milenaveneziani, you didn't explicitly request this but I also made changes here and on line 17 above to reference older E3SM runs.


<stream name="timeSeriesStatsMonthlyRestart"
type="input;output"
io_type="pnetcdf"
filename_template="mpascice.rst.am.timeSeriesStatsMonthly.$Y-$M-$D_$S.nc"
filename_template="mpasseaice.rst.am.timeSeriesStatsMonthly.$Y-$M-$D_$S.nc"
filename_interval="output_interval"
clobber_mode="truncate"
packages="timeSeriesStatsMonthlyAMPKG"
Expand All @@ -41,7 +42,7 @@ Several streams must be defined in the streams file, typically
<stream name="timeSeriesStatsMonthlyOutput"
type="output"
io_type="pnetcdf"
filename_template="mpascice.hist.am.timeSeriesStatsMonthly.$Y-$M-$D.nc"
filename_template="mpasseaice.hist.am.timeSeriesStatsMonthly.$Y-$M-$D.nc"
filename_interval="00-01-00_00:00:00"
output_interval="00-01-00_00:00:00"
clobber_mode="truncate"
Expand Down
4 changes: 2 additions & 2 deletions mpas_analysis/config.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ seaIceHistorySubdirectory = .
# or an absolute path.
oceanNamelistFileName = mpas-o_in
oceanStreamsFileName = streams.ocean
seaIceNamelistFileName = mpas-cice_in
seaIceStreamsFileName = streams.cice
seaIceNamelistFileName = mpas-seaice_in
seaIceStreamsFileName = streams.seaice

# names of ocean and sea ice meshes (e.g. oEC60to30, oQU240, oRRS30to10, etc.)
mpasMeshName = mesh
Expand Down