Skip to content

Commit eb4bc49

Browse files
bertiniabertinia
authored
Merge pull request #202 from NCAR/conform_mods
Changes needed to produce more cmip6 variables
2 parents 25009bf + 1e6fae2 commit eb4bc49

File tree

4 files changed

+301
-100
lines changed

4 files changed

+301
-100
lines changed

‎Config/config_timeseries.xml‎

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -141,71 +141,71 @@
141141
<tseries_output_format>netcdf4c</tseries_output_format>
142142
<tseries_tper>month_1</tseries_tper>
143143
<tseries_filecat_tper>years</tseries_filecat_tper>
144-
<tseries_filecat_n>1000</tseries_filecat_n>
144+
<tseries_filecat_n>50</tseries_filecat_n>
145145
</file_extension>
146146
<file_extension suffix=".h1.[0-9]">
147147
<subdir>hist</subdir>
148148
<tseries_create>FALSE</tseries_create>
149149
<tseries_output_format>netcdf4c</tseries_output_format>
150150
<tseries_tper>month_1</tseries_tper>
151151
<tseries_filecat_tper>years</tseries_filecat_tper>
152-
<tseries_filecat_n>100</tseries_filecat_n>
152+
<tseries_filecat_n>50</tseries_filecat_n>
153153
</file_extension>
154154
<file_extension suffix=".h2.[0-9]">
155155
<subdir>hist</subdir>
156156
<tseries_create>FALSE</tseries_create>
157157
<tseries_output_format>netcdf4c</tseries_output_format>
158158
<tseries_tper>month_1</tseries_tper>
159159
<tseries_filecat_tper>years</tseries_filecat_tper>
160-
<tseries_filecat_n>100</tseries_filecat_n>
160+
<tseries_filecat_n>50</tseries_filecat_n>
161161
</file_extension>
162162
<file_extension suffix=".h3.[0-9]">
163163
<subdir>hist</subdir>
164164
<tseries_create>FALSE</tseries_create>
165165
<tseries_output_format>netcdf4c</tseries_output_format>
166166
<tseries_tper>day_365</tseries_tper>
167167
<tseries_filecat_tper>years</tseries_filecat_tper>
168-
<tseries_filecat_n>100</tseries_filecat_n>
168+
<tseries_filecat_n>50</tseries_filecat_n>
169169
</file_extension>
170170
<file_extension suffix=".h4.[0-9]">
171171
<subdir>hist</subdir>
172172
<tseries_create>FALSE</tseries_create>
173173
<tseries_output_format>netcdf4c</tseries_output_format>
174174
<tseries_tper>day_365</tseries_tper>
175175
<tseries_filecat_tper>years</tseries_filecat_tper>
176-
<tseries_filecat_n>100</tseries_filecat_n>
176+
<tseries_filecat_n>50</tseries_filecat_n>
177177
</file_extension>
178178
<file_extension suffix=".h5.[0-9]">
179179
<subdir>hist</subdir>
180180
<tseries_create>FALSE</tseries_create>
181181
<tseries_output_format>netcdf4c</tseries_output_format>
182182
<tseries_tper>day_1</tseries_tper>
183183
<tseries_filecat_tper>years</tseries_filecat_tper>
184-
<tseries_filecat_n>100</tseries_filecat_n>
184+
<tseries_filecat_n>50</tseries_filecat_n>
185185
</file_extension>
186186
<file_extension suffix=".h6.[0-9]">
187187
<subdir>hist</subdir>
188188
<tseries_create>FALSE</tseries_create>
189189
<tseries_output_format>netcdf4c</tseries_output_format>
190190
<tseries_tper>day_1</tseries_tper>
191191
<tseries_filecat_tper>years</tseries_filecat_tper>
192-
<tseries_filecat_n>100</tseries_filecat_n>
192+
<tseries_filecat_n>50</tseries_filecat_n>
193193
</file_extension>
194194
<file_extension suffix=".h7.[0-9]">
195195
<subdir>hist</subdir>
196196
<tseries_create>FALSE</tseries_create>
197197
<tseries_output_format>netcdf4c</tseries_output_format>
198198
<tseries_tper>hour_3</tseries_tper>
199199
<tseries_filecat_tper>years</tseries_filecat_tper>
200-
<tseries_filecat_n>100</tseries_filecat_n>
200+
<tseries_filecat_n>50</tseries_filecat_n>
201201
</file_extension>
202202
<file_extension suffix=".h8.[0-9]">
203203
<subdir>hist</subdir>
204204
<tseries_create>FALSE</tseries_create>
205205
<tseries_output_format>netcdf4c</tseries_output_format>
206206
<tseries_tper>day_1</tseries_tper>
207207
<tseries_filecat_tper>years</tseries_filecat_tper>
208-
<tseries_filecat_n>100</tseries_filecat_n>
208+
<tseries_filecat_n>50</tseries_filecat_n>
209209
</file_extension>
210210
</files>
211211
<tseries_time_variant_variables>
@@ -219,16 +219,6 @@
219219
<variable>time_bounds</variable>
220220
<variable>time_written</variable>
221221
</tseries_time_variant_variables>
222-
<tseries_exclude_variables>
223-
<variable>HKSAT</variable>
224-
<variable>ZLAKE</variable>
225-
<variable>DZLAKE</variable>
226-
<variable>BSW</variable>
227-
<variable>SUCSAT</variable>
228-
<variable>ZSOI</variable>
229-
<variable>DZSOI</variable>
230-
<variable>WATSAT</variable>
231-
</tseries_exclude_variables>
232222
</comp_archive_spec>
233223

234224
<comp_archive_spec name="rtm">
@@ -242,31 +232,31 @@
242232
<tseries_output_format>netcdf4c</tseries_output_format>
243233
<tseries_tper>month_1</tseries_tper>
244234
<tseries_filecat_tper>years</tseries_filecat_tper>
245-
<tseries_filecat_n>1000</tseries_filecat_n>
235+
<tseries_filecat_n>50</tseries_filecat_n>
246236
</file_extension>
247237
<file_extension suffix=".h1.[0-9]">
248238
<subdir>hist</subdir>
249239
<tseries_create>FALSE</tseries_create>
250240
<tseries_output_format>netcdf4c</tseries_output_format>
251241
<tseries_tper>day_1</tseries_tper>
252242
<tseries_filecat_tper>years</tseries_filecat_tper>
253-
<tseries_filecat_n>100</tseries_filecat_n>
243+
<tseries_filecat_n>50</tseries_filecat_n>
254244
</file_extension>
255245
<file_extension suffix=".h2.[0-9]">
256246
<subdir>hist</subdir>
257247
<tseries_create>FALSE</tseries_create>
258248
<tseries_output_format>netcdf4c</tseries_output_format>
259249
<tseries_tper>hour_6</tseries_tper>
260250
<tseries_filecat_tper>years</tseries_filecat_tper>
261-
<tseries_filecat_n>100</tseries_filecat_n>
251+
<tseries_filecat_n>50</tseries_filecat_n>
262252
</file_extension>
263253
<file_extension suffix=".h3.[0-9]">
264254
<subdir>hist</subdir>
265255
<tseries_create>FALSE</tseries_create>
266256
<tseries_output_format>netcdf4c</tseries_output_format>
267257
<tseries_tper>hour_3</tseries_tper>
268258
<tseries_filecat_tper>years</tseries_filecat_tper>
269-
<tseries_filecat_n>100</tseries_filecat_n>
259+
<tseries_filecat_n>50</tseries_filecat_n>
270260
</file_extension>
271261
</files>
272262
<tseries_time_variant_variables>
@@ -293,31 +283,31 @@
293283
<tseries_output_format>netcdf4c</tseries_output_format>
294284
<tseries_tper>month_1</tseries_tper>
295285
<tseries_filecat_tper>years</tseries_filecat_tper>
296-
<tseries_filecat_n>1000</tseries_filecat_n>
286+
<tseries_filecat_n>50</tseries_filecat_n>
297287
</file_extension>
298288
<file_extension suffix=".h1.[0-9]">
299289
<subdir>hist</subdir>
300290
<tseries_create>FALSE</tseries_create>
301291
<tseries_output_format>netcdf4c</tseries_output_format>
302292
<tseries_tper>day_1</tseries_tper>
303293
<tseries_filecat_tper>years</tseries_filecat_tper>
304-
<tseries_filecat_n>100</tseries_filecat_n>
294+
<tseries_filecat_n>50</tseries_filecat_n>
305295
</file_extension>
306296
<file_extension suffix=".h2.[0-9]">
307297
<subdir>hist</subdir>
308298
<tseries_create>FALSE</tseries_create>
309299
<tseries_output_format>netcdf4c</tseries_output_format>
310300
<tseries_tper>hour_6</tseries_tper>
311301
<tseries_filecat_tper>years</tseries_filecat_tper>
312-
<tseries_filecat_n>100</tseries_filecat_n>
302+
<tseries_filecat_n>50</tseries_filecat_n>
313303
</file_extension>
314304
<file_extension suffix=".h3.[0-9]">
315305
<subdir>hist</subdir>
316306
<tseries_create>FALSE</tseries_create>
317307
<tseries_output_format>netcdf4c</tseries_output_format>
318308
<tseries_tper>hour_3</tseries_tper>
319309
<tseries_filecat_tper>years</tseries_filecat_tper>
320-
<tseries_filecat_n>100</tseries_filecat_n>
310+
<tseries_filecat_n>50</tseries_filecat_n>
321311
</file_extension>
322312
</files>
323313
<tseries_time_variant_variables>
@@ -344,15 +334,15 @@
344334
<tseries_output_format>netcdf4c</tseries_output_format>
345335
<tseries_tper>month_1</tseries_tper>
346336
<tseries_filecat_tper>years</tseries_filecat_tper>
347-
<tseries_filecat_n>1000</tseries_filecat_n>
337+
<tseries_filecat_n>50</tseries_filecat_n>
348338
</file_extension>
349339
<file_extension suffix=".h1.[0-9]">
350340
<subdir>hist</subdir>
351341
<tseries_create>FALSE</tseries_create>
352342
<tseries_output_format>netcdf4c</tseries_output_format>
353343
<tseries_tper>day_1</tseries_tper>
354344
<tseries_filecat_tper>years</tseries_filecat_tper>
355-
<tseries_filecat_n>100</tseries_filecat_n>
345+
<tseries_filecat_n>50</tseries_filecat_n>
356346
</file_extension>
357347
</files>
358348
<tseries_time_variant_variables>
@@ -372,47 +362,47 @@
372362
<tseries_output_format>netcdf4c</tseries_output_format>
373363
<tseries_tper>month_1</tseries_tper>
374364
<tseries_filecat_tper>years</tseries_filecat_tper>
375-
<tseries_filecat_n>1000</tseries_filecat_n>
365+
<tseries_filecat_n>50</tseries_filecat_n>
376366
</file_extension>
377367
<file_extension suffix=".h.nday1.[0-9]">
378368
<subdir>hist</subdir>
379369
<tseries_create>FALSE</tseries_create>
380370
<tseries_output_format>netcdf4c</tseries_output_format>
381371
<tseries_tper>day_1</tseries_tper>
382372
<tseries_filecat_tper>years</tseries_filecat_tper>
383-
<tseries_filecat_n>100</tseries_filecat_n>
373+
<tseries_filecat_n>50</tseries_filecat_n>
384374
</file_extension>
385375
<file_extension suffix=".h.nyear1.[0-9]">
386376
<subdir>hist</subdir>
387377
<tseries_create>FALSE</tseries_create>
388378
<tseries_output_format>netcdf4c</tseries_output_format>
389379
<tseries_tper>year_1</tseries_tper>
390380
<tseries_filecat_tper>years</tseries_filecat_tper>
391-
<tseries_filecat_n>100</tseries_filecat_n>
381+
<tseries_filecat_n>50</tseries_filecat_n>
392382
</file_extension>
393383
<file_extension suffix=".h.ecosys.[0-9]">
394384
<subdir>hist</subdir>
395385
<tseries_create>FALSE</tseries_create>
396386
<tseries_output_format>netcdf4c</tseries_output_format>
397387
<tseries_tper>month_1</tseries_tper>
398388
<tseries_filecat_tper>years</tseries_filecat_tper>
399-
<tseries_filecat_n>1000</tseries_filecat_n>
389+
<tseries_filecat_n>50</tseries_filecat_n>
400390
</file_extension>
401391
<file_extension suffix=".h.ecosys.nyear1.[0-9]">
402392
<subdir>hist</subdir>
403393
<tseries_create>FALSE</tseries_create>
404394
<tseries_output_format>netcdf4c</tseries_output_format>
405395
<tseries_tper>year_1</tseries_tper>
406396
<tseries_filecat_tper>years</tseries_filecat_tper>
407-
<tseries_filecat_n>1000</tseries_filecat_n>
397+
<tseries_filecat_n>50</tseries_filecat_n>
408398
</file_extension>
409399
<file_extension suffix=".h.ecosys.nday1.[0-9]">
410400
<subdir>hist</subdir>
411401
<tseries_create>FALSE</tseries_create>
412402
<tseries_output_format>netcdf4c</tseries_output_format>
413403
<tseries_tper>day_1</tseries_tper>
414404
<tseries_filecat_tper>years</tseries_filecat_tper>
415-
<tseries_filecat_n>100</tseries_filecat_n>
405+
<tseries_filecat_n>50</tseries_filecat_n>
416406
</file_extension>
417407
</files>
418408
<tseries_time_variant_variables>
@@ -432,15 +422,15 @@
432422
<tseries_output_format>netcdf4c</tseries_output_format>
433423
<tseries_tper>year_1</tseries_tper>
434424
<tseries_filecat_tper>years</tseries_filecat_tper>
435-
<tseries_filecat_n>1000</tseries_filecat_n>
425+
<tseries_filecat_n>50</tseries_filecat_n>
436426
</file_extension>
437427
<file_extension suffix=".h1.[0-9]">
438428
<subdir>hist</subdir>
439429
<tseries_create>FALSE</tseries_create>
440430
<tseries_output_format>netcdf4c</tseries_output_format>
441431
<tseries_tper>month_1</tseries_tper>
442432
<tseries_filecat_tper>years</tseries_filecat_tper>
443-
<tseries_filecat_n>1000</tseries_filecat_n>
433+
<tseries_filecat_n>50</tseries_filecat_n>
444434
</file_extension>
445435
</files>
446436
<tseries_time_variant_variables>
@@ -459,7 +449,7 @@
459449
<tseries_output_format>netcdf4c</tseries_output_format>
460450
<tseries_tper>month_1</tseries_tper>
461451
<tseries_filecat_tper>years</tseries_filecat_tper>
462-
<tseries_filecat_n>1000</tseries_filecat_n>
452+
<tseries_filecat_n>50</tseries_filecat_n>
463453
</file_extension>
464454
</files>
465455
</comp_archive_spec>

‎Externals.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ local_path = reshaper/pyReshaper
1313
required = True
1414

1515
[PyConform]
16-
tag = PyConform-0.2.5
16+
tag = PyConform-0.2.8
1717
protocol = git
1818
repo_url = https://github.com/NCAR/PyConform.git
1919
local_path = conformer/conformer

0 commit comments

Comments
 (0)