diff --git a/README.md b/README.md index b3f208287..f3982d569 100644 --- a/README.md +++ b/README.md @@ -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 file) - * `streams.cice` - * `mpas-cice_in` + * `streams.seaice` + * `mpas-seaice_in` + +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` + ## Purge Old Analysis diff --git a/configs/anvil/config.20170926.FCT2.A_WCYCL1850S.ne30_oECv3.anvil b/configs/anvil/config.20170926.FCT2.A_WCYCL1850S.ne30_oECv3.anvil index c96b7444a..035d50c55 100644 --- a/configs/anvil/config.20170926.FCT2.A_WCYCL1850S.ne30_oECv3.anvil +++ b/configs/anvil/config.20170926.FCT2.A_WCYCL1850S.ne30_oECv3.anvil @@ -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. diff --git a/configs/cori/config.20171201.default.GMPAS-IAF.T62_oRRS30to10v3wLI.cori-knl b/configs/cori/config.20171201.default.GMPAS-IAF.T62_oRRS30to10v3wLI.cori-knl index d7e31c660..e32a02ef0 100644 --- a/configs/cori/config.20171201.default.GMPAS-IAF.T62_oRRS30to10v3wLI.cori-knl +++ b/configs/cori/config.20171201.default.GMPAS-IAF.T62_oRRS30to10v3wLI.cori-knl @@ -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. diff --git a/configs/edison/config.20170807.beta1.G_oQU240.edison b/configs/edison/config.20170807.beta1.G_oQU240.edison index 15176e615..a5ebc0465 100644 --- a/configs/edison/config.20170807.beta1.G_oQU240.edison +++ b/configs/edison/config.20170807.beta1.G_oQU240.edison @@ -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. diff --git a/configs/edison/config.20171102.beta3rc02_1850.ne30_oECv3_ICG.edison b/configs/edison/config.20171102.beta3rc02_1850.ne30_oECv3_ICG.edison index c98f76515..c4d7fb149 100644 --- a/configs/edison/config.20171102.beta3rc02_1850.ne30_oECv3_ICG.edison +++ b/configs/edison/config.20171102.beta3rc02_1850.ne30_oECv3_ICG.edison @@ -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. diff --git a/configs/edison/config.B_low_res_ice_shelves_1696_JWolfe_layout_Edison b/configs/edison/config.B_low_res_ice_shelves_1696_JWolfe_layout_Edison index 8a76e16bd..3cb7742d2 100644 --- a/configs/edison/config.B_low_res_ice_shelves_1696_JWolfe_layout_Edison +++ b/configs/edison/config.B_low_res_ice_shelves_1696_JWolfe_layout_Edison @@ -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. diff --git a/configs/lanl/config.20170207.MPAS-SeaIce.QU60km_polar.wolf b/configs/lanl/config.20170207.MPAS-SeaIce.QU60km_polar.wolf index 51cf6628f..d019a4c00 100644 --- a/configs/lanl/config.20170207.MPAS-SeaIce.QU60km_polar.wolf +++ b/configs/lanl/config.20170207.MPAS-SeaIce.QU60km_polar.wolf @@ -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. diff --git a/configs/lanl/config.MatchBoth_orig b/configs/lanl/config.MatchBoth_orig index 2c04fc127..c0d36a3ee 100644 --- a/configs/lanl/config.MatchBoth_orig +++ b/configs/lanl/config.MatchBoth_orig @@ -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. diff --git a/configs/olcf/config.20170313.beta1.A_WCYCL1850S.ne30_oECv3_ICG.edison b/configs/olcf/config.20170313.beta1.A_WCYCL1850S.ne30_oECv3_ICG.edison index c4b567970..3d93c3a80 100644 --- a/configs/olcf/config.20170313.beta1.A_WCYCL1850S.ne30_oECv3_ICG.edison +++ b/configs/olcf/config.20170313.beta1.A_WCYCL1850S.ne30_oECv3_ICG.edison @@ -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. diff --git a/configs/olcf/config.GMPAS-IAF_oRRS18to6v3.titan b/configs/olcf/config.GMPAS-IAF_oRRS18to6v3.titan index b38ae1983..33585854f 100644 --- a/configs/olcf/config.GMPAS-IAF_oRRS18to6v3.titan +++ b/configs/olcf/config.GMPAS-IAF_oRRS18to6v3.titan @@ -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. diff --git a/configs/theta/config.20171031.tenYearTest.GMPAS-IAF.T62_oEC60to30v3wLI.60layer.theta b/configs/theta/config.20171031.tenYearTest.GMPAS-IAF.T62_oEC60to30v3wLI.60layer.theta index 2d87a8b84..190e7c374 100644 --- a/configs/theta/config.20171031.tenYearTest.GMPAS-IAF.T62_oEC60to30v3wLI.60layer.theta +++ b/configs/theta/config.20171031.tenYearTest.GMPAS-IAF.T62_oEC60to30v3wLI.60layer.theta @@ -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. diff --git a/docs/mpasseaice.rst b/docs/mpasseaice.rst index 78060d37b..248209ad7 100644 --- a/docs/mpasseaice.rst +++ b/docs/mpasseaice.rst @@ -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. @@ -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"``)::