Skip to content

Commit 133eef9

Browse files
weiyuan-jiangweiyuan-jiang
committed
added more 2D outputs to sample HISTORY.rc
1 parent dd54caa commit 133eef9

File tree

3 files changed

+96
-22
lines changed

3 files changed

+96
-22
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Added
1313

14+
- Added EASE to Latlon and Cubed-Sphere to EASE history outputs
1415
- Added optional SLURM "constraint".
1516
- Added functionality to run on tile space of stretched cube-sphere grids.
1617
- Added python package for post-processing ObsFcstAna output.

‎GEOSldas_App/GEOSldas_HIST.rc‎

Lines changed: 92 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# "#CUBE 'tavg24_2d_lnd_Nx'"
77
# does *not* mean that the 'lnd' output will be on a cube-sphere grid.
88

9-
#CUBE VERSION: 1
9+
VERSION: 1
1010

1111
# Must edit 'EXPID' manually if HISTORY file is re-used without going
1212
# through "ldas_setup".
@@ -15,9 +15,10 @@ EXPID: GEOSldas_expid
1515

1616
COLLECTIONS:
1717
#EASE 'tavg24_1d_lfs_Nt'
18-
#CUBE 'tavg24_2d_lfs_Nx'
19-
#EASE 'tavg24_1d_lnd_Nt'
20-
#CUBE 'tavg24_2d_lnd_Nx'
18+
'tavg24_2d_lfs_Nx'
19+
#EASE 'tavg24_1d_lnd_Nt'
20+
'tavg24_2d_lnd_Nx'
21+
#CUBE 'tavg24_2d_lnd_EASE'
2122
#ASSIM 'SMAP_L4_SM_gph'
2223
# 'inst1_1d_lnr_Nt'
2324
# 'catch_progn_incr'
@@ -29,24 +30,28 @@ COLLECTIONS:
2930
# 'tavg24_1d_glc_Nt'
3031
::
3132

32-
#CUBE GRID_LABELS: PC720x361-DC
33-
#CUBE PC1440x721-DC
33+
GRID_LABELS: PC720x361-DC
34+
PC1440x721-DC
35+
EASEv2_M36
36+
::
3437

35-
#CUBE ::
38+
PC720x361-DC.GRID_TYPE: LatLon
39+
PC720x361-DC.IM_WORLD: 720
40+
PC720x361-DC.JM_WORLD: 361
41+
PC720x361-DC.POLE: PC
42+
PC720x361-DC.DATELINE: DC
43+
PC720x361-DC.LM: 1
3644

37-
#CUBE PC720x361-DC.GRID_TYPE: LatLon
38-
#CUBE PC720x361-DC.IM_WORLD: 720
39-
#CUBE PC720x361-DC.JM_WORLD: 361
40-
#CUBE PC720x361-DC.POLE: PC
41-
#CUBE PC720x361-DC.DATELINE: DC
42-
#CUBE PC720x361-DC.LM: 1
45+
PC1440x721-DC.GRID_TYPE: LatLon
46+
PC1440x721-DC.IM_WORLD: 1440
47+
PC1440x721-DC.JM_WORLD: 721
48+
PC1440x721-DC.POLE: PC
49+
PC1440x721-DC.DATELINE: DC
50+
PC1440x721-DC.LM: 1
4351

44-
#CUBE PC1440x721-DC.GRID_TYPE: LatLon
45-
#CUBE PC1440x721-DC.IM_WORLD: 1440
46-
#CUBE PC1440x721-DC.JM_WORLD: 721
47-
#CUBE PC1440x721-DC.POLE: PC
48-
#CUBE PC1440x721-DC.DATELINE: DC
49-
#CUBE PC1440x721-DC.LM: 1
52+
EASEv2_M36.GRID_TYPE: EASE
53+
EASEv2_M36.GRIDNAME: EASEv2_M36
54+
EASEv2_M36.LM: 1
5055

5156
# Detailed definition of the collections listed above
5257
#
@@ -323,6 +328,74 @@ COLLECTIONS:
323328
::
324329

325330

331+
tavg24_2d_lnd_EASE.format: 'CFIO',
332+
tavg24_2d_lnd_EASE.descr: '2d,Daily,Time-Averaged,Single-Level,Assimilation,Land Surface Diagnostics',
333+
tavg24_2d_lnd_EASE.nbits: 12,
334+
tavg24_2d_lnd_EASE.template: '%y4%m2%d2_%h2%n2z.nc4',
335+
tavg24_2d_lnd_EASE.mode: 'time-averaged',
336+
tavg24_2d_lnd_EASE.frequency: 240000,
337+
tavg24_2d_lnd_EASE.ref_time: 000000,
338+
tavg24_2d_lnd_EASE.regrid_exch: '../input/tile.data'
339+
tavg24_2d_lnd_EASE.regrid_name: 'GRIDNAME'
340+
# tavg24_2d_lnd_EASE.regrid_method: 'BILINEAR_MONOTONIC' ,
341+
tavg24_2d_lnd_EASE.grid_label: EASEv2_M36
342+
tavg24_2d_lnd_EASE.deflate: 2,
343+
tavg24_2d_lnd_EASE.fields: 'GRN' , 'VEGDYN' ,
344+
'LAI' , 'VEGDYN' ,
345+
'WET3' , 'GridComp' , 'GWETPROF' ,
346+
'WET2' , 'GridComp' , 'GWETROOT' ,
347+
'WET1' , 'GridComp' , 'GWETTOP' ,
348+
'WCPR' , 'GridComp' , 'PRMC' ,
349+
'WCRZ' , 'GridComp' , 'RZMC' ,
350+
'WCSF' , 'GridComp' , 'SFMC' ,
351+
'CAPAC' , 'GridComp' , 'INTRWATR' ,
352+
'TPSNOW' , 'GridComp' , 'TPSNOWLAND' ,
353+
'TPUNST' , 'GridComp' , 'TUNSTLAND' ,
354+
'TPSAT' , 'GridComp' , 'TSATLAND' ,
355+
'TPWLT' , 'GridComp' , 'TWLTLAND' ,
356+
'TPSURF' , 'GridComp' , 'TSURFLAND' ,
357+
'TP1' , 'GridComp' , 'TSOIL1' , # CATCH GC: TP1, ENSAVG GC: TSOIL1TILE
358+
'TP2' , 'GridComp' , 'TSOIL2' , # ...
359+
'TP3' , 'GridComp' , 'TSOIL3' , # ...
360+
'TP4' , 'GridComp' , 'TSOIL4' , # ...
361+
'TP5' , 'GridComp' , 'TSOIL5' , # ...
362+
'TP6' , 'GridComp' , 'TSOIL6' , # ...
363+
'PRLAND' , 'GridComp' , 'PRECTOTCORRLAND' , # assume "corrected" precip
364+
'SNOLAND' , 'GridComp' , 'PRECSNOCORRLAND' , # assume "corrected" precip
365+
'TSLAND' , 'GridComp' , 'SNOMASLAND' ,
366+
'SNOWDP' , 'GridComp' , 'SNODPLAND' ,
367+
'EVPSOI' , 'GridComp' , 'LHLANDSOIL' ,
368+
'EVPVEG' , 'GridComp' , 'LHLANDTRNS' ,
369+
'EVPINT' , 'GridComp' , 'LHLANDINTR' ,
370+
'EVPICE' , 'GridComp' , 'LHLANDSBLN' ,
371+
'RUNSURF' , 'GridComp' , 'RUNSURFLAND' ,
372+
'BASEFLOW' , 'GridComp' , 'BASEFLOWLAND' ,
373+
'SMLAND' , 'GridComp' ,
374+
'QINFIL' , 'GridComp' , 'QINFILLAND' ,
375+
'FRUST' , 'GridComp' , 'FRLANDUNST' ,
376+
'FRSAT' , 'GridComp' , 'FRLANDSAT' ,
377+
'ASNOW' , 'GridComp' , 'FRLANDSNO' ,
378+
'FRWLT' , 'GridComp' , 'FRLANDWLT' ,
379+
'DFPARLAND' , 'GridComp' , 'PARDFLAND' ,
380+
'DRPARLAND' , 'GridComp' , 'PARDRLAND' ,
381+
'SHLAND' , 'GridComp' ,
382+
'LHLAND' , 'GridComp' ,
383+
'EVLAND' , 'GridComp' ,
384+
'LWLAND' , 'GridComp' ,
385+
'SWLAND' , 'GridComp' ,
386+
'GHLAND' , 'GridComp' ,
387+
'TWLAND' , 'GridComp' ,
388+
'TELAND' , 'GridComp' ,
389+
'DWLAND' , 'GridComp' , 'WCHANGELAND' ,
390+
'DHLAND' , 'GridComp' , 'ECHANGELAND' ,
391+
'SPLAND' , 'GridComp' , 'SPSHLAND' ,
392+
# 'SPLH' , 'GridComp' , 'SPLHLAND' , # works for Catch only, not yet for CatchCN
393+
'SPWATR' , 'GridComp' , 'SPEVLAND' ,
394+
'SPSNOW' , 'GridComp' , 'SPSNLAND' ,
395+
'PEATCLSM_WATERLEVEL', 'GridComp' ,
396+
'PEATCLSM_FSWCHANGE' , 'GridComp' ,
397+
::
398+
326399
const_1d_lnd_Nt.descr: 'Tile-space,Constant,Time-invariant,Single-Level,Assimilation,Land Surface Model Parameters',
327400
const_1d_lnd_Nt.template: '%y4%m2%d2_%h2%n2z.bin',
328401
const_1d_lnd_Nt.mode: 'instantaneous',

‎GEOSldas_App/process_hist.csh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
setenv LSM_CHOICE $1
88
setenv AEROSOL_DEPOSITION $2
99
setenv GRID $3
10-
setenv GRIDNAME $4
10+
setenv GRIDNAME "'$4'"
1111
setenv HISTRC $5
1212
setenv RUN_IRRIG $6
1313
setenv ASSIM $7
@@ -26,11 +26,11 @@ endif
2626
if($GRID == CUBE) then
2727
sed -i '/^\#EASE/d' $HISTRC
2828
sed -i 's|\#CUBE|''|g' $HISTRC
29-
sed -i 's|GRIDNAME|'"$GRIDNAME"'|g' $HISTRC
29+
sed -i -e s/\'GRIDNAME\'/$GRIDNAME/g $HISTRC
3030
else
3131
sed -i '/^\#CUBE/d' $HISTRC
3232
sed -i 's|\#EASE|''|g' $HISTRC
33-
sed -i 's|GRIDNAME|'"$GRIDNAME"'|g' $HISTRC
33+
sed -i -e s/\'GRIDNAME\'/$GRIDNAME/g $HISTRC
3434
endif
3535

3636
if($LSM_CHOICE == 1) then

0 commit comments

Comments
 (0)