Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0800e54
updates for integrated setup and coupled run of LADAS
saraqzhang Jan 28, 2025
57e74c6
Merge branch 'develop' into feature/saraqzhang/updatesetup4ladas
gmao-rreichle Jan 31, 2025
7fe7a89
fixed loss of some text from underlying develop version of ldas_setup
gmao-rreichle Feb 7, 2025
76795ca
minimal cleanup re. LADAS coupling (ldas_setup, exeinp.txt.Hy4dEnVar.*)
gmao-rreichle Feb 7, 2025
1d416fa
first iteration of changes for the option of using bkg lfo in…
saraqzhang Feb 13, 2025
3614242
for ladas lfo with bkg tag,and use HISTdet.rc, HISTens.rc
saraqzhang Feb 25, 2025
e622d0f
new file: GEOSldas_HISTdet.rc
saraqzhang Feb 25, 2025
14a6d64
new file: GEOSldas_HISTens.rc
saraqzhang Feb 25, 2025
54bed5d
cleanup and a fix in ldas_setup
saraqzhang Feb 25, 2025
2d6d069
update to bkg lfo in exeinp.txt.Hy4dEnVar.atmens & exeinp.txt.…
saraqzhang Feb 25, 2025
4ec59c6
Merge branch 'develop' into feature/saraqzhang/updatesetup4ladas
saraqzhang Feb 27, 2025
0a3cd3c
edits responding to comments at PR#81
saraqzhang Mar 27, 2025
c0c12f2
name fix in GEOSldas_HISTdet.rc
saraqzhang Mar 27, 2025
4170567
add comments on fvsetup-provided resource parameters
saraqzhang Mar 31, 2025
96af721
removed execute permissions from LDAS_Forcing.F90
gmao-rreichle Apr 8, 2025
fdef165
cleaned up "Nx+-" forcing option (replaced by "bkg.lfo_*") (LDAS_For…
gmao-rreichle Apr 8, 2025
a3a2463
Merge branch 'develop' into feature/saraqzhang/updatesetup4ladas
gmao-rreichle Apr 8, 2025
6a10dae
updated CHANGELOG.md
gmao-rreichle Apr 8, 2025
3bdc723
Merge branch 'develop' into feature/saraqzhang/updatesetup4ladas
gmao-rreichle Apr 10, 2025
f670c37
addtional collections to HISTens.rc and forcing filename bkg.…
saraqzhang Apr 10, 2025
88da354
commented out lndfcstana collection (so not written by default), move…
gmao-rreichle Apr 11, 2025
185f057
re-instated "Nx+-" functionality for optional segment in MET_TAG to e…
gmao-rreichle Apr 14, 2025
f239bc7
Update CHANGELOG.md
gmao-rreichle Apr 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated subroutines read_obs_sm_ASCAT_EUMET(), read_obs_SMAP_halforbit_Tb(), read_obs_SMOS() and read_obs_MODIS_SCF() with hardcoded time ranges for when observations are available and should be read.
- Revised variable names (SHORT_NAME) and descriptions (LONG_NAME) to match M21C file specs.
- Renamed tilecoord%pfaf to %pfaf_index; added matlab tile file reader.
- Improved setup of coupled land/atm DAS (incl. changed nomenclature of met forcing files: "Nx+-" --> "bkg.lfo_*").

### Fixed

Expand Down
167 changes: 167 additions & 0 deletions GEOSldas_App/GEOSldas_HISTdet.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
#
# Sample GEOSldas HISTORY.rc file for LADAS (central simulation)
#
# This sample is for the GEOSldas instance that is coupled with the central
# simulation component of the Hy4dEnVar ADAS:
#
# (1) The "catch_progn_incr" is output is the ensemble average.
# (2) The "catch_progn_incr" output is in tile space. Its definition is generic
##################################################################################

VERSION: 1
EXPID: GEOSldas_expid

COLLECTIONS:
'catch_progn_incr'
'tavg3_1d_lnd_Nt'
'inst3_2d_lndfcstana_Nx'
::

GRID_LABELS: PC720x361-DC
PC576x361-DC
::

PC720x361-DC.GRID_TYPE: LatLon
PC720x361-DC.IM_WORLD: 720
PC720x361-DC.JM_WORLD: 361
PC720x361-DC.POLE: PC
PC720x361-DC.DATELINE: DC
PC720x361-DC.LM: 1

PC576x361-DC.GRID_TYPE: LatLon
PC576x361-DC.IM_WORLD: 576
PC576x361-DC.JM_WORLD: 361
PC576x361-DC.POLE: PC
PC576x361-DC.DATELINE: DC
PC576x361-DC.LM: 1


catch_progn_incr.descr: 'Tile-space,3-Hourly,Instantaneous,Single-Level,Assimilation,Ensemble-Average Land Prognostics Increments',
catch_progn_incr.template: '%y4%m2%d2_%h2%n2z.bin',
catch_progn_incr.mode: 'instantaneous',
catch_progn_incr.frequency: 030000,
catch_progn_incr.ref_time: 013000,
catch_progn_incr.fields: 'TCFSAT_INCR' , 'LANDASSIM' ,
'TCFTRN_INCR' , 'LANDASSIM' ,
'TCFWLT_INCR' , 'LANDASSIM' ,
'QCFSAT_INCR' , 'LANDASSIM' ,
'QCFTRN_INCR' , 'LANDASSIM' ,
'QCFWLT_INCR' , 'LANDASSIM' ,
'CAPAC_INCR' , 'LANDASSIM' ,
'CATDEF_INCR' , 'LANDASSIM' ,
'RZEXC_INCR' , 'LANDASSIM' ,
'SRFEXC_INCR' , 'LANDASSIM' ,
'GHTCNT1_INCR' , 'LANDASSIM' ,
'GHTCNT2_INCR' , 'LANDASSIM' ,
'GHTCNT3_INCR' , 'LANDASSIM' ,
'GHTCNT4_INCR' , 'LANDASSIM' ,
'GHTCNT5_INCR' , 'LANDASSIM' ,
'GHTCNT6_INCR' , 'LANDASSIM' ,
'WESNN1_INCR' , 'LANDASSIM' ,
'WESNN2_INCR' , 'LANDASSIM' ,
'WESNN3_INCR' , 'LANDASSIM' ,
'HTSNNN1_INCR' , 'LANDASSIM' ,
'HTSNNN2_INCR' , 'LANDASSIM' ,
'HTSNNN3_INCR' , 'LANDASSIM' ,
'SNDZN1_INCR' , 'LANDASSIM' ,
'SNDZN2_INCR' , 'LANDASSIM' ,
'SNDZN3_INCR' , 'LANDASSIM' ,
::

tavg3_1d_lnd_Nt.descr: 'Tile-space,Time-Averaged,Single-Level,Assimilation,Land Surface Diagnostics',
tavg3_1d_lnd_Nt.nbits: 12,
tavg3_1d_lnd_Nt.template: '%y4%m2%d2_%h2%n2z.bin',
tavg3_1d_lnd_Nt.mode: 'time-averaged',
tavg3_1d_lnd_Nt.frequency: 030000,
tavg3_1d_lnd_Nt.ref_time: 013000,
tavg3_1d_lnd_Nt.fields: 'WET3' , 'ENSAVG' , 'GWETPROF' ,
'WET2' , 'ENSAVG' , 'GWETROOT' ,
'WET1' , 'ENSAVG' , 'GWETTOP' ,
'WCPR' , 'ENSAVG' , 'PRMC' ,
'WCRZ' , 'ENSAVG' , 'RZMC' ,
'WCSF' , 'ENSAVG' , 'SFMC' ,
'TPSNOW' , 'ENSAVG' ,
'TPUNST' , 'ENSAVG' , 'TUNST' ,
'TPSAT' , 'ENSAVG' , 'TSAT' ,
'TPWLT' , 'ENSAVG' , 'TWLT' ,
'TPSURF' , 'ENSAVG' , 'TSURF' ,
'GRN' , 'VEGDYN_e0001' ,
'LAI' , 'VEGDYN_e0001' ,
'TP1' , 'ENSAVG' ,
'TP2' , 'ENSAVG' ,
'TP3' , 'ENSAVG' ,
'TP4' , 'ENSAVG' ,
'TP5' , 'ENSAVG' ,
'TP6' , 'ENSAVG' ,
'PRLAND' , 'ENSAVG' , 'PRECTOTLAND' ,
'SNOLAND' , 'ENSAVG' , 'PRECSNOLAND' ,
'TSLAND' , 'ENSAVG' , 'SNOMAS' ,
'SNOWDP' , 'ENSAVG' , 'SNODP' ,
'EVPSOI' , 'ENSAVG' , 'EVPSOIL' ,
'EVPVEG' , 'ENSAVG' , 'EVPTRNS' ,
'EVPINT' , 'ENSAVG' , 'EVPINTR' ,
'EVPICE' , 'ENSAVG' , 'EVPSBLN' ,
'RUNSURF' , 'ENSAVG' , 'RUNOFF' ,
'BASEFLOW' , 'ENSAVG' ,
'SMLAND' , 'ENSAVG' ,
'QINFIL' , 'ENSAVG' ,
'FRUST' , 'ENSAVG' , 'FRUNST' ,
'FRSAT' , 'ENSAVG' ,
'ASNOW' , 'ENSAVG' , 'FRSNO' ,
'FRWLT' , 'ENSAVG' ,
'DFPARLAND' , 'ENSAVG' , 'PARDFLAND' ,
'DRPARLAND' , 'ENSAVG' , 'PARDRLAND' ,
'SHLAND' , 'ENSAVG' ,
'LHLAND' , 'ENSAVG' ,
'EVLAND' , 'ENSAVG' ,
'LWLAND' , 'ENSAVG' ,
'SWLAND' , 'ENSAVG' ,
'GHLAND' , 'ENSAVG' ,
'TWLAND' , 'ENSAVG' ,
'TELAND' , 'ENSAVG' ,
'DWLAND' , 'ENSAVG' , 'WCHANGE' ,
'DHLAND' , 'ENSAVG' , 'ECHANGE' ,
'SPLAND' , 'ENSAVG' ,
'SPWATR' , 'ENSAVG' ,
'SPSNOW' , 'ENSAVG' ,
'PEATCLSM_WATERLEVEL', 'ENSAVG' ,
'PEATCLSM_FSWCHANGE' , 'ENSAVG' ,
::


inst3_2d_lndfcstana_Nx.descr: '2d,3-Hourly,Instantaneous,Single-Level,Assimilation,Ensemble Land Forecast and Analysis Diagnostics',
inst3_2d_lndfcstana_Nx.nbits: 12,
inst3_2d_lndfcstana_Nx.template: '%y4%m2%d2_%h2%n2z.nc4',
inst3_2d_lndfcstana_Nx.archive: '%c/Y%y4',
inst3_2d_lndfcstana_Nx.mode: 'instantaneous',
inst3_2d_lndfcstana_Nx.frequency: 030000,
inst3_2d_lndfcstana_Nx.ref_time: 013000,
inst3_2d_lndfcstana_Nx.format: 'CFIO',
inst3_2d_lndfcstana_Nx.regrid_exch: '../input/tile.data',
inst3_2d_lndfcstana_Nx.regrid_name: 'GRIDNAME',
inst3_2d_lndfcstana_Nx.grid_label: PC720x361-DC,
inst3_2d_lndfcstana_Nx.deflate: 2,
inst3_2d_lndfcstana_Nx.fields: 'WCSF' , 'ENSAVG' , 'SFMC_FCST' ,
'WCRZ' , 'ENSAVG' , 'RZMC_FCST' ,
'WCPR' , 'ENSAVG' , 'PRMC_FCST' ,
'TPSURF' , 'ENSAVG' , 'TSURF_FCST' ,
'TP1' , 'ENSAVG' , 'TSOIL1_FCST' ,
'WCSF_ENSSTD' , 'ENSAVG' , 'SFMC_FCST_ENSSTD' ,
'WCRZ_ENSSTD' , 'ENSAVG' , 'RZMC_FCST_ENSSTD' ,
'WCPR_ENSSTD' , 'ENSAVG' , 'PRMC_FCST_ENSSTD' ,
'TPSURF_ENSSTD' , 'ENSAVG' , 'TSURF_FCST_ENSSTD' ,
'TP1_ENSSTD' , 'ENSAVG' , 'TSOIL1_FCST_ENSSTD' ,
'WCSF_ANA' , 'LANDASSIM' , 'SFMC_ANA' ,
'WCRZ_ANA' , 'LANDASSIM' , 'RZMC_ANA' ,
'WCPR_ANA' , 'LANDASSIM' , 'PRMC_ANA' ,
'TPSURF_ANA' , 'LANDASSIM' , 'TSURF_ANA' ,
'TP1_ANA' , 'LANDASSIM' , 'TSOIL1_ANA' ,
'WCSF_ANA_ENSSTD' , 'LANDASSIM' , 'SFMC_ANA_ENSSTD' ,
'WCRZ_ANA_ENSSTD' , 'LANDASSIM' , 'RZMC_ANA_ENSSTD' ,
'WCPR_ANA_ENSSTD' , 'LANDASSIM' , 'PRMC_ANA_ENSSTD' ,
'TPSURF_ANA_ENSSTD' , 'LANDASSIM' , 'TSURF_ANA_ENSSTD' ,
'TP1_ANA_ENSSTD' , 'LANDASSIM' , 'TSOIL1_ANA_ENSSTD'
::


# ========================== EOF ==============================================================
Loading
Loading