Skip to content

Commit b29481e

Browse files
Change default format of tile-space HISTORY output to nc4 (#144)
2 parents 4bce232 + 1cc676d commit b29481e

File tree

7 files changed

+97
-635
lines changed

7 files changed

+97
-635
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818

1919
- Cleaned up ldas_setup. Split out ldas.py and setup_utils.py.
2020
- Added reader for surface meteorological forcing from S2S-3.
21-
- Update `GEOSlandassim_GridComp/io_hdf5.F90` to allow for use with HDF5 1.14
21+
- Update `GEOSlandassim_GridComp/io_hdf5.F90` to allow for use with HDF5 1.14.
22+
- Changed default format of tile-space HISTORY output to nc4.
2223

2324
### Fixed
2425

GEOSldas_App/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ ecbuild_add_executable (
99
SOURCES preprocess_ldas.F90 preprocess_ldas_routines.F90
1010
LIBS GEOSldas_GridComp MAPL)
1111

12-
ecbuild_add_executable (
13-
TARGET tile_bin2nc4.x
14-
SOURCES tile_bin2nc4.F90
15-
LIBS MAPL)
16-
1712
ecbuild_add_executable (
1813
TARGET mwrtm_bin2nc4.x
1914
SOURCES util/inputs/mwRTM_params/mwrtm_bin2nc4.F90

GEOSldas_App/GEOSldas_HIST.rc

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ EXPID: GEOSldas_expid
1313
# pre-defined Collections
1414

1515
COLLECTIONS:
16-
#OUT1d 'tavg24_1d_lfs_Nt'
1716
#OUT2d 'tavg24_2d_lfs_Nx'
1817
#OUT1d 'tavg24_1d_lnd_Nt'
1918
#OUT2d 'tavg24_2d_lnd_Nx'
@@ -68,32 +67,14 @@ EASEv2_M36.LM: 1
6867
# with "gzip"; nc4 files can be compressed using the "compress_bit-shaved_nc4.sh"
6968
# utility script.
7069

71-
tavg24_1d_lfs_Nt.descr: 'Tile-space,Daily,Time-Averaged,Single-Level,Assimilation,Land Surface Forcings and States',
72-
tavg24_1d_lfs_Nt.nbits: 12,
73-
tavg24_1d_lfs_Nt.template: '%y4%m2%d2_%h2%n2z.bin',
74-
tavg24_1d_lfs_Nt.archive: '%c/Y%y4',
75-
tavg24_1d_lfs_Nt.mode: 'time-averaged',
76-
tavg24_1d_lfs_Nt.frequency: 240000,
77-
tavg24_1d_lfs_Nt.ref_time: 000000,
78-
tavg24_1d_lfs_Nt.fields:'Tair' , 'METFORCE' ,
79-
'Qair' , 'METFORCE' ,
80-
'LWdown' , 'METFORCE' ,
81-
'SWdown' , 'METFORCE' ,
82-
'Wind' , 'METFORCE' ,
83-
'Psurf' , 'METFORCE' ,
84-
'Rainf_C' , 'METFORCE' ,
85-
'Rainf' , 'METFORCE' ,
86-
'Snowf' , 'METFORCE' ,
87-
'RainfSnowf' , 'METFORCE' ,
88-
'RefH' , 'METFORCE' ,
89-
'CATDEF' , 'GridComp' ,
90-
'RZEXC' , 'GridComp' ,
91-
'SRFEXC' , 'GridComp' ,
92-
'WESNN1' , 'GridComp' ,
93-
'WESNN2' , 'GridComp' ,
94-
'WESNN3' , 'GridComp' ,
95-
'HLWUP' , 'GridComp' ,
96-
::
70+
# NOTE (Nov 2025):
71+
# Changes for *1d* output with recent introduction of land+landice simulations:
72+
# - Direct *1d* output to nc4 via MAPL.
73+
# - Removed tile_bin2nc4.F90; no longer works for land-only collections in land+landice
74+
# simulations because it uses tilecoord.bin, which contains info for all tiles.
75+
# - Removed *1d* lfs collection; no longer works in land+landice simulations because of
76+
# different tile spaces for CATCH and METFORCE.
77+
#
9778

9879
tavg24_2d_lfs_Nx.descr: '2d,Daily,Time-Averaged,Single-Level,Assimilation,Land Surface Forcings and States',
9980
tavg24_2d_lfs_Nx.nbits: 12,
@@ -129,8 +110,9 @@ EASEv2_M36.LM: 1
129110

130111
tavg24_1d_lnd_Nt.descr: 'Tile-space,Daily,Time-Averaged,Single-Level,Assimilation,Land Surface Diagnostics',
131112
tavg24_1d_lnd_Nt.nbits: 12,
132-
tavg24_1d_lnd_Nt.template: '%y4%m2%d2_%h2%n2z.bin',
113+
tavg24_1d_lnd_Nt.template: '%y4%m2%d2_%h2%n2z.nc4',
133114
tavg24_1d_lnd_Nt.mode: 'time-averaged',
115+
tavg24_1d_lnd_Nt.format: 'CFIO',
134116
tavg24_1d_lnd_Nt.frequency: 240000,
135117
tavg24_1d_lnd_Nt.ref_time: 000000,
136118
tavg24_1d_lnd_Nt.fields: 'GRN' , 'VEGDYN' ,
@@ -334,8 +316,9 @@ EASEv2_M36.LM: 1
334316

335317

336318
const_1d_lnd_Nt.descr: 'Tile-space,Constant,Time-invariant,Single-Level,Assimilation,Land Surface Model Parameters',
337-
const_1d_lnd_Nt.template: '%y4%m2%d2_%h2%n2z.bin',
319+
const_1d_lnd_Nt.template: '%y4%m2%d2_%h2%n2z.nc4',
338320
const_1d_lnd_Nt.mode: 'instantaneous',
321+
const_1d_lnd_Nt.format: 'CFIO',
339322
const_1d_lnd_Nt.frequency: 240000,
340323
const_1d_lnd_Nt.ref_time: 000000,
341324
const_1d_lnd_Nt.fields: 'DZGT1' , 'GridComp' ,
@@ -386,8 +369,9 @@ EASEv2_M36.LM: 1
386369

387370
SMAP_L4_SM_gph.descr: 'Tile-space,3-Hourly,Time-Averaged,Single-Level,Assimilation,SMAP L4_SM Land Geophysical Diagnostics',
388371
SMAP_L4_SM_gph.nbits: 12,
389-
SMAP_L4_SM_gph.template: '%y4%m2%d2_%h2%n2z.bin',
372+
SMAP_L4_SM_gph.template: '%y4%m2%d2_%h2%n2z.nc4',
390373
SMAP_L4_SM_gph.mode: 'time-averaged',
374+
SMAP_L4_SM_gph.format: 'CFIO',
391375
SMAP_L4_SM_gph.frequency: 030000,
392376
SMAP_L4_SM_gph.ref_time: 000000,
393377
SMAP_L4_SM_gph.fields: 'WCSF' , 'ENSAVG' , 'sm_surface' ,
@@ -437,8 +421,9 @@ EASEv2_M36.LM: 1
437421

438422
inst1_1d_lnr_Nt.descr: 'Tile-space,1-Hourly,Instantaneous,Single-Level,Assimilation,Land Nature Run Diagnostics',
439423
inst1_1d_lnr_Nt.nbits: 12,
440-
inst1_1d_lnr_Nt.template: '%y4%m2%d2_%h2%n2z.bin' ,
424+
inst1_1d_lnr_Nt.template: '%y4%m2%d2_%h2%n2z.nc4' ,
441425
inst1_1d_lnr_Nt.mode: 'instantaneous' ,
426+
inst1_1d_lnr_Nt.format: 'CFIO',
442427
inst1_1d_lnr_Nt.frequency: 010000 ,
443428
inst1_1d_lnr_Nt.ref_time: 000000,
444429
inst1_1d_lnr_Nt.fields: 'TPSURF' , 'ENSAVG' , 'surface_temp' ,
@@ -453,8 +438,9 @@ EASEv2_M36.LM: 1
453438
# By default, no bit shaving for increments output.
454439

455440
catch_progn_incr.descr: 'Tile-space,3-Hourly,Instantaneous,Single-Level,Assimilation,Ensemble-Average Land Prognostics Increments',
456-
catch_progn_incr.template: '%y4%m2%d2_%h2%n2z.bin',
441+
catch_progn_incr.template: '%y4%m2%d2_%h2%n2z.nc4',
457442
catch_progn_incr.mode: 'instantaneous',
443+
catch_progn_incr.format: 'CFIO',
458444
catch_progn_incr.frequency: 030000,
459445
catch_progn_incr.ref_time: 000000,
460446
catch_progn_incr.fields: 'TCFSAT_INCR' , 'LANDASSIM' ,
@@ -491,8 +477,9 @@ EASEv2_M36.LM: 1
491477

492478
inst3_1d_lndfcstana_Nt.descr: 'Tile-space,3-Hourly,Instantaneous,Single-Level,Assimilation,Ensemble Land Forecast and Analysis Diagnostics',
493479
inst3_1d_lndfcstana_Nt.nbits: 12,
494-
inst3_1d_lndfcstana_Nt.template: '%y4%m2%d2_%h2%n2z.bin',
480+
inst3_1d_lndfcstana_Nt.template: '%y4%m2%d2_%h2%n2z.nc4',
495481
inst3_1d_lndfcstana_Nt.mode: 'instantaneous',
482+
inst3_1d_lndfcstana_Nt.format: 'CFIO',
496483
inst3_1d_lndfcstana_Nt.frequency: 030000,
497484
inst3_1d_lndfcstana_Nt.ref_time: 000000,
498485
inst3_1d_lndfcstana_Nt.fields: 'WCSF' , 'ENSAVG' , 'SFMC_FCST' ,
@@ -601,8 +588,9 @@ EASEv2_M36.LM: 1
601588

602589
tavg24_1d_glc_Nt.descr: 'Tile-space,Daily,Time-Averaged,Single-level,Land Ice Diagnostics',
603590
tavg24_1d_glc_Nt.nbits: 12,
604-
tavg24_1d_glc_Nt.template: '%y4%m2%d2_%h2%n2z.bin' ,
591+
tavg24_1d_glc_Nt.template: '%y4%m2%d2_%h2%n2z.nc4' ,
605592
tavg24_1d_glc_Nt.mode: 'time-averaged' ,
593+
tavg24_1d_glc_Nt.format: 'CFIO',
606594
tavg24_1d_glc_Nt.frequency: 240000 ,
607595
tavg24_1d_glc_Nt.ref_time: 000000 ,
608596
tavg24_1d_glc_Nt.fields: 'ASNOW_GL' , 'LANDICE' ,

GEOSldas_App/GEOSldas_HISTdet.rc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ PC576x361-DC.LM: 1
3737

3838

3939
catch_progn_incr.descr: 'Tile-space,3-Hourly,Instantaneous,Single-Level,Assimilation,Ensemble-Average Land Prognostics Increments',
40-
catch_progn_incr.template: '%y4%m2%d2_%h2%n2z.bin',
40+
catch_progn_incr.template: '%y4%m2%d2_%h2%n2z.nc4',
4141
catch_progn_incr.mode: 'instantaneous',
42+
catch_progn_incr.format: 'CFIO',
4243
catch_progn_incr.frequency: 030000,
4344
catch_progn_incr.ref_time: 013000,
4445
catch_progn_incr.fields: 'TCFSAT_INCR' , 'LANDASSIM' ,
@@ -70,8 +71,9 @@ catch_progn_incr.fields: 'TCFSAT_INCR' , 'LANDASSIM' ,
7071

7172
tavg3_1d_lnd_Nt.descr: 'Tile-space,Time-Averaged,Single-Level,Assimilation,Land Surface Diagnostics',
7273
tavg3_1d_lnd_Nt.nbits: 12,
73-
tavg3_1d_lnd_Nt.template: '%y4%m2%d2_%h2%n2z.bin',
74+
tavg3_1d_lnd_Nt.template: '%y4%m2%d2_%h2%n2z.nc4',
7475
tavg3_1d_lnd_Nt.mode: 'time-averaged',
76+
tavg3_1d_lnd_Nt.format: 'CFIO',
7577
tavg3_1d_lnd_Nt.frequency: 030000,
7678
tavg3_1d_lnd_Nt.ref_time: 013000,
7779
tavg3_1d_lnd_Nt.fields: 'WET3' , 'ENSAVG' , 'GWETPROF' ,

0 commit comments

Comments
 (0)