Skip to content

Commit

Permalink
Merge pull request #202 from NCAR/conform_mods
Browse files Browse the repository at this point in the history 
Changes needed to produce more cmip6 variables
  • Loading branch information
@bertinia
bertinia authored May 6, 2019
2 parents 25009bf + 1e6fae2 commit eb4bc49
Show file tree
Hide file tree
Showing 4 changed files with 301 additions and 100 deletions.
66 changes: 28 additions & 38 deletions Config/config_timeseries.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,71 +141,71 @@
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>month_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>1000</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h1.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>month_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h2.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>month_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h3.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>day_365</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h4.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>day_365</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h5.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>day_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h6.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>day_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h7.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>hour_3</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h8.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>day_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
</files>
<tseries_time_variant_variables>
Expand All @@ -219,16 +219,6 @@
<variable>time_bounds</variable>
<variable>time_written</variable>
</tseries_time_variant_variables>
<tseries_exclude_variables>
<variable>HKSAT</variable>
<variable>ZLAKE</variable>
<variable>DZLAKE</variable>
<variable>BSW</variable>
<variable>SUCSAT</variable>
<variable>ZSOI</variable>
<variable>DZSOI</variable>
<variable>WATSAT</variable>
</tseries_exclude_variables>
</comp_archive_spec>

<comp_archive_spec name="rtm">
Expand All @@ -242,31 +232,31 @@
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>month_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>1000</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h1.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>day_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h2.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>hour_6</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h3.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>hour_3</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
</files>
<tseries_time_variant_variables>
Expand All @@ -293,31 +283,31 @@
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>month_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>1000</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h1.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>day_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h2.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>hour_6</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h3.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>hour_3</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
</files>
<tseries_time_variant_variables>
Expand All @@ -344,15 +334,15 @@
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>month_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>1000</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h1.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>day_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
</files>
<tseries_time_variant_variables>
Expand All @@ -372,47 +362,47 @@
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>month_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>1000</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h.nday1.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>day_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h.nyear1.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>year_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h.ecosys.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>month_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>1000</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h.ecosys.nyear1.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>year_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>1000</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h.ecosys.nday1.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>day_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>100</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
</files>
<tseries_time_variant_variables>
Expand All @@ -432,15 +422,15 @@
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>year_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>1000</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
<file_extension suffix=".h1.[0-9]">
<subdir>hist</subdir>
<tseries_create>FALSE</tseries_create>
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>month_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>1000</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
</files>
<tseries_time_variant_variables>
Expand All @@ -459,7 +449,7 @@
<tseries_output_format>netcdf4c</tseries_output_format>
<tseries_tper>month_1</tseries_tper>
<tseries_filecat_tper>years</tseries_filecat_tper>
<tseries_filecat_n>1000</tseries_filecat_n>
<tseries_filecat_n>50</tseries_filecat_n>
</file_extension>
</files>
</comp_archive_spec>
Expand Down
2 changes: 1 addition & 1 deletion Externals.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ local_path = reshaper/pyReshaper
required = True

[PyConform]
tag = PyConform-0.2.5
tag = PyConform-0.2.8
protocol = git
repo_url = https://github.com/NCAR/PyConform.git
local_path = conformer/conformer
Expand Down
Loading

0 comments on commit eb4bc49

Please sign in to comment.