Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging Bridge into master #246

Merged
merged 115 commits into from
Jun 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
e2522d1
PARdffs bug fix and add time step for sun angle
weiyuan-jiang Sep 19, 2019
4f8f194
Merge pull request #81 from GEOS-ESM/hotfix/REAME-typo
weiyuan-jiang Dec 9, 2019
8e0cb9f
Merge branch 'develop' into hotfix/par_and_zenith
Dec 10, 2019
63af837
Merge pull request #53 from GEOS-ESM/hotfix/par_and_zenith
Dec 10, 2019
dca1bae
changed Z0_FORM=4, prep to use INLv3
Dec 10, 2019
6800b75
- rewrite README.GEOSldas_history, change name to md
Dec 10, 2019
b42963d
Minor documentation fixes
gmao-rreichle Dec 10, 2019
a1e865a
minimal fix of "f525land_fpp" experiment name
gmao-rreichle Dec 10, 2019
ce4ace3
Minor update to text.
gmao-rreichle Dec 11, 2019
e26ce04
another minimal comment update
gmao-rreichle Dec 11, 2019
598e38d
Merge pull request #87 from GEOS-ESM/feature/jperket/updateDocs
Dec 11, 2019
5eb8ef8
manual merge from develop
Dec 11, 2019
f379475
Merge pull request #84 from GEOS-ESM/feature/jperket/INv3+Z0form4
Dec 11, 2019
53f2261
get_GEOS forcing bug fix for stream boundaries (#90)
gmao-rreichle Dec 18, 2019
0a23229
renamed HISTORY.md to CHANGELOG.md; edited CHANGELOG.md for v17.9.0-…
gmao-rreichle Dec 20, 2019
b628bca
Merge pull request #92 from GEOS-ESM/rreichle/tmp_update_to_develop_2…
Dec 20, 2019
8b9e403
Update CHANGELOG.md (#95)
gmao-rreichle Dec 20, 2019
2e25e12
no check for cat_progns after perturbations (#98)
weiyuan-jiang Jan 17, 2020
28ec8fa
Update CHANGELOG.md (#99)
gmao-rreichle Jan 17, 2020
cd35500
Fixes #105. Use a MAPL v1.1 tag for develop
mathomp4 Feb 7, 2020
0c185fe
Merge pull request #106 from GEOS-ESM/mathomp4-patch-1
weiyuan-jiang Feb 7, 2020
da17a02
- added FP-5.25 transition (30 Jan 2020) to "cross-stream" dates
gmao-rreichle Feb 10, 2020
22dbb1d
Merge pull request #107 from GEOS-ESM/hotfix/rreichle-getGEOS-add-f52…
weiyuan-jiang Feb 11, 2020
f769fcc
Dev/mapl 2.0 (#91)
weiyuan-jiang Feb 14, 2020
6667773
Merge branch 'develop' of github.com:GEOS-ESM/GEOSldas into feature/i…
saraqzhang Feb 16, 2020
46d220d
correction on ldas_incr names in nc4 output
saraqzhang Feb 16, 2020
8443e16
Merge pull request #117 from GEOS-ESM/feature/incr_names
weiyuan-jiang Feb 16, 2020
e384d93
comply with MAPL2-0
weiyuan-jiang Feb 18, 2020
9ff2f24
Merge pull request #118 from GEOS-ESM/bugfix/hist_rc
weiyuan-jiang Feb 19, 2020
8fbdd4e
clean up
weiyuan-jiang Feb 19, 2020
184caef
keep MAPL1.0 HISTORY.rc style for non cs grid
weiyuan-jiang Feb 19, 2020
966417c
Merge pull request #119 from GEOS-ESM/bugfix/hist_rc
weiyuan-jiang Feb 19, 2020
d43d488
Update Externals.cfg
gmao-rreichle Feb 21, 2020
f739a54
Merge pull request #121 from GEOS-ESM/gmao-rreichle-patch-1
weiyuan-jiang Feb 21, 2020
e05850b
add catch_progn_incr to HISTORY collection (#124)
saraqzhang Feb 25, 2020
142234e
use history to output increment
weiyuan-jiang Feb 25, 2020
eaecadb
remove out_incr and out_incr_format
weiyuan-jiang Feb 26, 2020
aba0212
add SLES 12 support and compress land pert restart (#127)
weiyuan-jiang Feb 26, 2020
5165eaf
Merge pull request #131 from GEOS-ESM/develop
weiyuan-jiang Feb 26, 2020
8750222
Merge pull request #132 from GEOS-ESM/bugfix/out_incr_history
weiyuan-jiang Feb 26, 2020
fa03ad5
Update CHANGELOG.md
gmao-rreichle Feb 26, 2020
6255897
Merge pull request #135 from GEOS-ESM/gmao-rreichle-patch-1
weiyuan-jiang Feb 27, 2020
8fe7811
bug fix. run error for GNU
weiyuan-jiang Feb 27, 2020
2c121bf
Merge pull request #140 from GEOS-ESM/bugfix/run_eror_forGNU
weiyuan-jiang Feb 27, 2020
9449a74
bug fix monthly (#141)
weiyuan-jiang Feb 28, 2020
03072cb
Move to MAPL v2.0.1 (#143)
mathomp4 Mar 2, 2020
b04dc5f
Re-tiling clean-up and additional RESTART options (#149)
weiyuan-jiang Mar 13, 2020
bf868bd
move log file back to scratch then copy to where it should be (#150)
weiyuan-jiang Mar 17, 2020
a5ce606
reorder the output according to the original tile order (#152)
weiyuan-jiang Mar 18, 2020
b75495d
Update README.md
gmao-rreichle Mar 18, 2020
ff81e14
updated for v17.9.0-beta.3 pre-release
gmao-rreichle Mar 18, 2020
091cec6
Update README.md
gmao-rreichle Mar 18, 2020
d613869
Merge pull request #153 from GEOS-ESM/gmao-rreichle-patch-1
weiyuan-jiang Mar 18, 2020
822e26e
bug fix. wrong indent (#158)
weiyuan-jiang Mar 20, 2020
babc760
Revised GEOSldas README.md (#161)
gmao-rreichle Mar 26, 2020
c1797c2
added FP f525_p5_fp transition (7 Apr 2020) to "cross-stream" dates (…
gmao-rreichle Apr 3, 2020
070ef2b
Feature/parallel pre post processing (#166)
weiyuan-jiang Apr 3, 2020
631c252
New Surface parameter resource file (#160)
gmao-rreichle Apr 6, 2020
eef12ba
README.md update for SLES12 (#167)
gmao-rreichle Apr 8, 2020
8f3c6f5
bug fix for pertseed restart from an existing run (#169)
weiyuan-jiang Apr 10, 2020
e3b782c
clarified compute node requirement for SLES12 (#170)
gmao-rreichle Apr 11, 2020
9abb8d5
bug fix: removed indent that broke subdaily2daily (#171)
gmao-rreichle Apr 13, 2020
79654cf
Merge branch 'master' into rreichle-develop_on_20200414
gmao-rreichle Apr 14, 2020
f424f43
Merging master into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle Apr 15, 2020
d76be60
fix gnu debug (#178)
weiyuan-jiang Apr 16, 2020
dc75417
checkpoint files are geneareted by GEOSldas (#182)
weiyuan-jiang Apr 22, 2020
9adfa70
subdaily2daily concatenation; SLES12 sbatch fix
weiyuan-jiang Apr 22, 2020
01f6506
pass in optional account through ldas_setup (#184)
weiyuan-jiang Apr 23, 2020
1bcbc99
updating to MAPL 2.1.1 (#185)
gmao-rreichle Apr 23, 2020
5c08490
Resurrecting SMAP L1C Tb fore-minus-aft check
gmao-rreichle Apr 23, 2020
4e8d4cf
Syncing develop into BRIDGE_FROM_DEVELOP_TO_MASTER (#188)
gmao-rreichle Apr 23, 2020
032b8b0
fix for GNU compiler problem with Execute_command_line()
weiyuan-jiang Apr 23, 2020
26e1e76
Updating Externals.cfg for the develop branch
gmao-rreichle Apr 23, 2020
6056815
Merge branch 'develop' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle Apr 23, 2020
7cbc1e8
syncing BRIDGE_FROM_DEVELOP_TO_MASTER into develop
gmao-rreichle Apr 23, 2020
9c51ec2
New Externals.cfg in prep for v17.9.0-beta.4 tag
gmao-rreichle Apr 23, 2020
36c9451
Merge branch 'master' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle Apr 23, 2020
1f9f8f1
removing white space that was inadvertently...
gmao-rreichle Apr 23, 2020
c34355d
Syncing master into Bridge_from_develop_to_master
gmao-rreichle Apr 23, 2020
c42cd92
Edit Externals.cfg in prep for sync with develop
gmao-rreichle Apr 23, 2020
1f8b833
Sync Bridge_from_develop_to_master into develop
gmao-rreichle Apr 23, 2020
668af68
new ESMA_env tag (v2.1.1+intel19.1.0)
weiyuan-jiang Apr 24, 2020
df7e896
cleanup of obsolete LDASsa code (#199)
gmao-rreichle Apr 29, 2020
c162caf
fix to subdaily-to-daily nc4 concatenation fix
weiyuan-jiang Apr 29, 2020
6985c66
fix mpi_finalize fail (#207)
weiyuan-jiang May 5, 2020
4f23307
Add forecast error covariance inflation (#203)
gmao-rreichle May 5, 2020
ae0a779
fix subdaily to daily ( cut for time) (#202)
weiyuan-jiang May 6, 2020
2a40df1
exclude some comments in .rc files from being copied to the *.exec in…
weiyuan-jiang May 7, 2020
6bed8fa
Functionality for using "seamless" FP data (with generic file names) …
gmao-rreichle May 11, 2020
4695c6a
Sync develop into bridge branch (#215)
gmao-rreichle May 11, 2020
acec6c7
Update Externals.cfg in prep for beta.5 pre-release
gmao-rreichle May 11, 2020
16aab82
Merge branch 'BRIDGE_FROM_DEVELOP_TO_MASTER' into master
gmao-rreichle May 11, 2020
fca64a5
Sync master back into BRIDGE_FROM_DEVELOP_TO_MASTER (#217)
gmao-rreichle May 11, 2020
d45ff75
Update Externals.cfg back to what it should be in develop
gmao-rreichle May 11, 2020
98fef9e
Sync bridge branch back into develop (#218)
gmao-rreichle May 11, 2020
a899fdf
update mepo (#220)
weiyuan-jiang May 14, 2020
a20c3bf
Tb output from HISTORY (#223)
gmao-rreichle May 19, 2020
92e1100
minor fixes (#224)
gmao-rreichle May 20, 2020
72f741d
Merge branch 'develop' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle May 20, 2020
4a39399
editing Externals.cfg in prep for merge into master
gmao-rreichle May 20, 2020
5b783d1
Merge branch 'BRIDGE_FROM_DEVELOP_TO_MASTER' into master
gmao-rreichle May 20, 2020
d09e51d
Merge branch 'master' of github.com:GEOS-ESM/GEOSldas
gmao-rreichle May 20, 2020
c1f746f
synching develop into BRIDGE
gmao-rreichle May 20, 2020
350abdd
Merge BRIDGE into develop (#226)
gmao-rreichle May 20, 2020
4086d5e
Tb HISTORY output, bug fixes, and cleanup (#231)
gmao-rreichle May 29, 2020
797af3f
Merge branch 'develop' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle May 29, 2020
1129277
Merge branch 'master' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle May 29, 2020
05a8a32
Merge branch 'master' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle May 29, 2020
e019b3d
synching develop's External into BRIDGE
gmao-rreichle May 29, 2020
bc58032
Sync Bridge back into develop (from master) (#233)
gmao-rreichle May 29, 2020
d58bb48
Forecast and analysis output of model diagnostics via HISTORY (#240)
gmao-rreichle Jun 10, 2020
55fa3ed
LANDPERT restart fixes and assorted bug fixes (#244)
gmao-rreichle Jun 11, 2020
c6be70f
Merge branch 'develop' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle Jun 11, 2020
47eaadc
updating Externals.cfg in prep for merge to master
gmao-rreichle Jun 11, 2020
2fb75e4
Merge branch 'master' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle Jun 11, 2020
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
2 changes: 1 addition & 1 deletion Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protocol = git
required = True
repo_url = git@github.com:GEOS-ESM/GEOSgcm_GridComp.git
local_path = ./src/Components/GEOSldas_GridComp/@GEOSgcm_GridComp
tag = v1.8.5
tag = v1.8.6
protocol = git
sparse = ../../../../config/GEOSgcm_GridComp_ldas.sparse

Expand Down
93 changes: 84 additions & 9 deletions doc/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,98 @@ This README file contains the history of stable GEOSldas versions ("tags") in Gi
Overview of Git Releases:
============================





------------------------------
[v17.9.0-beta.7](https://github.com/GEOS-ESM/GEOSldas/releases/tag/v17.9.0-beta.7) - 2020-06-11
------------------------------

- Zero-diff vs. v17.9.0-beta.6 for model-only simulations without perturbations.

- Not zero-diff for simulations with perturbations (including data assimilation).

- Infrastructure:

- Added calculation of ensemble-mean Catchment model diagnostics to LANDASSIM GridComp for output of instantaneous forecast and analysis estimates via HISTORY (“lndfcstana” Collection).


- Bug fixes and other minor changes:

- Fixed handling of LANDPERT restart files after cold-start in first job segment.

- For lat/lon and EASE tile space only, fixed violation of zero-diff (binary identical) results when stopping/restarting at different intervals (removed extra zero-mean adjustment of LANDPERT after reading from restart file). Requires more work for cube-sphere tile space.

- Fixed LANDPERT restart file name for cube-sphere.

- Added log message for all ens members if LANDPERT is cold-started.

- Removed deflation of LANDPERT checkpoint files.

- Added “.nc4” file name extension for cube-sphere LANDPERT checkpoint file.

- Added log message for OBSPERTRSEED “cold” start.

- Fixed typo in default OBSPERTRSEED restart file name.

- Fixed time stamp of output *ensprop*inputs.nml file.

- Fixed FIRST_ENS_ID for post-processing.

- Added “endhour” for control of loop through job segments in lenkf.j.template to facilitate job segments that are shorter than a full day.

- Added sample entries in “LDAS.rc” for output of CHECKPOINT (restart) files before GEOSldas.x exits (RECORD_FREQUENCY, RECORD_REF_TIME, RECORD_REF_DATE).



------------------------------
[v17.9.0-beta.6](https://github.com/GEOS-ESM/GEOSldas/releases/tag/v17.9.0-beta.6) - 2020-05-29
------------------------------

- Zero-diff vs. v17.9.0-beta.5 for model-only simulations without perturbations.

- Not zero-diff for simulations with perturbations (including data assimilation).

- Infrastructure:

- Output of L-band Tb via HISTORY (nodata value = MAPL_UNDEF = 1.e15).

- Bug fixes:

- Changed timing of application of model prognostics perturbations such that perturbations at the current time step impact the land analysis and HISTORY output at that same time step. Before the fix, ApplyPrognPert was executed too late and the current time step's prognostics perturbations were missed by the land analysis and HISTORY, and only felt at the next time step. Consequently, simulations with perturbations are not zero-diff vs. v17.9.0-beta.5.

- Fixed no-data-value handling in computation of the ensemble average for surface temperature components.

- Cleanup and documentation:

- Avoids redundant entries in LDAS.rc.
- Enabled setup for NUM_ENSEMBLE=1 with PERTURBATION=1.
- Improved help and log messages for setup and configuration.
- Option "--runmodel" of "ldas_setup" script is now obsolete.
- "DATAATM" renamed to "METFORCE" in HISTORY.rc.
- Removed default constraint to Haswell nodes.



------------------------------
[v17.9.0-beta.5](https://github.com/GEOS-ESM/GEOSldas/releases/tag/v17.9.0-beta.5) - 2020-05-11
------------------------------
- Pre-release meant for use under SLES12 at NCCS. Still works for SLES11.

- New/Updated Science Functionality:
- Science functionality:

- Forecast error covariance inflation with scalar (globally constant) factor.

- New/Updated Infrastructure:
- Infrastructure:

- Support for GEOS FP forcing with generic ("seamless") file names.
- Resource parameter changes:
- Renamed NUM_ENSEMBLE to NUM_LDAS_ENSEMBLE in "exeinp" file to be consistent with LDAS.rc.
- Renamed MONTHLY_OUTPUT to POSTPROC_HIST.
- Updated utilities to MAPL v2.1.3, ESMA_env v2.1.3+intel19.1.0.

- Bug Fixes and Other Minor Changes:
- Bug fixes and other minor changes:

- Added basic protections for concatenation of sub-daily into daily nc4 files and for generation of monthly-mean nc4 files.
- Write ObsFcstAna and smapL4SMaup files into ./scratch, then move to ana/ens_avg/year/month dir in postprocessing.
Expand All @@ -70,11 +145,11 @@ Overview of Git Releases:
- Zero-diff vs. v17.9.0-beta.3 for Catchment only (except SMAP L1C Tb fore-minus-aft check).
- Not zero-diff for CatchCN (via v1.8.3 of GEOS_GCMGridComp).

- New/Updated Science Functionality:
- Science functionality:

- Resurrected SMAP L1C Tb fore-minus-aft check.

- New/Updated Infrastructure:
- Infrastructure:

- Updated utilities to MAPL v2.1.1, ESMA_env v2.1.1., ESMA_cmake v3.0.1.
- New GEOS_SurfaceGridComp.rc file (via v1.8.3 of GEOS_GCMGridComp).
Expand All @@ -84,7 +159,7 @@ Overview of Git Releases:
- Subdaily-to-daily concatenation processes before month is complete.
- Temporary solution to create directories for ObsFcstAna files to enable extending an existing GEOSldas run without going through setup.

- Bug Fixes and Other Minor Changes:
- Bug fixes and other minor changes:

- Updated README.md.
- ~obspertrseed~ restart file name when restarting from existing run.
Expand All @@ -101,7 +176,7 @@ Overview of Git Releases:
------------------------------
[v17.9.0-beta.2](https://github.com/GEOS-ESM/GEOSldas/releases/tag/v17.9.0-beta.2) - 2020-02-26
------------------------------
- New/Updated Science Functionality:
- Science functionality:

- Assimilation when running on cube-sphere tiles.
- Read forcing from cube-sphere grid when running on matching cube-sphere tiles.
Expand All @@ -111,7 +186,7 @@ Overview of Git Releases:
- Configuration option to add extra variables into catch restart files (as needed by GCM).
- Allows processing of (assimilation) observations for innovations output *without* perturbations turned on.

- New/Updated Infrastructure:
- Infrastructure:

- Support for SLES 12 in addition to SLES11 (ESMA_env v2.0.2).
- Updated to MAPL v2.0.
Expand All @@ -121,7 +196,7 @@ Overview of Git Releases:
- Added LDAS_app/mk_GEOSldasRestarts.F90 (adapted from GCM GridComp's mk_LDASsaRestarts.F90 in preparation for re-tiling changes).
- Fixed output log file name and location.

- Bug Fixes and Other Minor Changes:
- Bug fixes and other minor changes:

- Bug fix in select-update_type 9 (abs(deltaT)>0.)
- Bug fix for local mwRTM and time dimension restart.
Expand Down
43 changes: 43 additions & 0 deletions src/Applications/LDAS_App/GEOSldas_HIST.rc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ COLLECTIONS:
#ASSIM 'SMAP_L4_SM_gph'
# 'inst1_1d_lnr_Nt'
# 'catch_progn_incr'
# 'inst3_1d_lndfcstana_Nt'
# 'inst3_2d_lndfcstana_Nx'
::

#CUBE GRID_LABELS: PC720x361-DC
Expand Down Expand Up @@ -372,3 +374,44 @@ COLLECTIONS:
'SNDZN3_INCR' , 'LANDASSIM' ,
::

inst3_1d_lndfcstana_Nt.descr: 'Tile-space,3-Hourly,Instantaneous,Single-Level,Assimilation,Ensemble-Average Land Forecast and Analysis Diagnostics',
inst3_1d_lndfcstana_Nt.template: '%y4%m2%d2_%h2%n2z.bin',
inst3_1d_lndfcstana_Nt.mode: 'instantaneous',
inst3_1d_lndfcstana_Nt.frequency: 030000,
inst3_1d_lndfcstana_Nt.ref_time: 000000,
inst3_1d_lndfcstana_Nt.fields: 'WCSF' , 'ENSAVG' , 'SFMC_FCST' ,
'WCRZ' , 'ENSAVG' , 'RZMC_FCST' ,
'WCPR' , 'ENSAVG' , 'PRMC_FCST' ,
'TPSURF' , 'ENSAVG' , 'TSURF_FCST' ,
'TSOIL1TILE' , 'ENSAVG' , 'TSOIL1_FCST' ,
'WCSF_ANA' , 'LANDASSIM' , 'SFMC_ANA' ,
'WCRZ_ANA' , 'LANDASSIM' , 'RZMC_ANA' ,
'WCPR_ANA' , 'LANDASSIM' , 'PRMC_ANA' ,
'TPSURF_ANA' , 'LANDASSIM' , 'TSURF_ANA' ,
'TSOIL1_ANA' , 'LANDASSIM' , 'TSOIL1_ANA' ,
::

inst3_2d_lndfcstana_Nx.descr: '2d,3-Hourly,Instantaneous,Single-Level,Assimilation,Ensemble-Average Land Forecast and Analysis Diagnostics',
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: 000000,
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' ,
'TSOIL1TILE' , 'ENSAVG' , 'TSOIL1_FCST' ,
'WCSF_ANA' , 'LANDASSIM' , 'SFMC_ANA' ,
'WCRZ_ANA' , 'LANDASSIM' , 'RZMC_ANA' ,
'WCPR_ANA' , 'LANDASSIM' , 'PRMC_ANA' ,
'TPSURF_ANA' , 'LANDASSIM' , 'TSURF_ANA' ,
'TSOIL1_ANA' , 'LANDASSIM' , 'TSOIL1_ANA' ,
::

# ========================== EOF ==============================================================
13 changes: 12 additions & 1 deletion src/Applications/LDAS_App/GEOSldas_LDAS.rc
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ FIRST_ENS_ID: 0

# ---- Job segments: Length
#
# Specify period between output of restart files. (GEOSldas.x shuts down and restarts.)
# Specify period between GEOSldas.x shutdown and restart.
# Default is the entire simulation period (END_DATE minus BEG_DATE).
# Format: yyyymmdd hhmmss
#
Expand All @@ -125,6 +125,17 @@ FIRST_ENS_ID: 0
# NUM_SGMT: 1


# ---- CHECKPOINT file output
#
# By default, CHECKPOINT (restart) files are are written at the end of each job segment.
# Restart files can also be written before exiting GEOSldas.x.
# The following resource parameters specify the frequency and reference time and date.
#
# RECORD_FREQUENCY: 0240000 # hhhmmss (can be greater than 1 day!)
# RECORD_REF_TIME: 000000 # hhmmss (reference time-of-day)
# RECORD_REF_DATE: 19790101 000000 # yyyymmdd hhmmss (date/time after which checkpoints are written)


# ---- Output: Write log file (YES/NO)?
#
LDAS_logit: YES
Expand Down
9 changes: 6 additions & 3 deletions src/Applications/LDAS_App/ldas_setup
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ class LDASsetup:
self.has_ldassa_pert = False
self.nSegments = 1
self.perturb = 0
self.first_ens_id = 0
# ------
# Read exe input file which is required to set up the dir
# ------
Expand Down Expand Up @@ -142,12 +143,12 @@ class LDASsetup:
_mydir = self.exphome + '/' + self.rqdExeInp['EXP_ID']
assert not os.path.isdir(_mydir), 'Dir [%s] already exists!' % _mydir
_mydir = None
_first_ens_id = int(self.rqdExeInp.get('FIRST_ENS_ID',0))
self.first_ens_id = int(self.rqdExeInp.get('FIRST_ENS_ID',0))
self.perturb = int(self.rqdExeInp.get('PERTURBATIONS',0))
if self.nens > 1:
self.perturb = 1
self.ensdirs = ['ens%04d'%iens for iens in range(_first_ens_id, self.nens + _first_ens_id)]
self.ensids = ['%04d'%iens for iens in range(_first_ens_id, self.nens + _first_ens_id)]
self.ensdirs = ['ens%04d'%iens for iens in range(self.first_ens_id, self.nens + self.first_ens_id)]
self.ensids = ['%04d'%iens for iens in range(self.first_ens_id, self.nens + self.first_ens_id)]
if (self.nens == 1) :
self.ensdirs_avg = self.ensdirs
self.ensids=['']
Expand Down Expand Up @@ -1273,6 +1274,8 @@ class LDASsetup:
fout.write(line.replace('MY_MODEL',self.catch))
elif 'MY_POSTPROC_HIST' in line :
fout.write(line.replace('MY_POSTPROC_HIST',str(self.rqdExeInp['POSTPROC_HIST'])))
elif 'MY_FIRST_ENS_ID' in line :
fout.write(line.replace('MY_FIRST_ENS_ID',str(self.first_ens_id)))
else :
fout.write(line.replace('MY_EXPDIR',self.exphome+'/$EXPID'))

Expand Down
25 changes: 19 additions & 6 deletions src/Applications/LDAS_App/lenkf.j.template
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,9 @@ EOF
# Move Intermediate Checkpoints to RESTARTS directory
# ---------------------------------------------------

@ inens = 0
while ($inens < $NENS)
@ inens = MY_FIRST_ENS_ID
@ enens = $inens + $NENS
while ($inens < $enens)
if ($inens <10) then
set ENSDIR = `echo ens000${inens}`
else if($inens<100) then
Expand All @@ -599,11 +600,19 @@ EOF
set rstf = 'landpert'
if (-f ${rstf}${ENSID}_internal_checkpoint ) then
set tmp_file = $EXPDIR/output/$EXPDOMAIN/rs/$ENSDIR/Y${eYEAR}/M${eMON}/${EXPID}.${rstf}_internal_rst.${eYEAR}${eMON}${eDAY}_${eHour}${eMin}
# copy generic restart file to final location/name but remove lat/lon variables
# (lat/lon variables are not correct when running in EASE-grid tile space)
ncks -4 -O -C -x -v lat,lon ${rstf}${ENSID}_internal_checkpoint $tmp_file
/bin/rm -f ${rstf}${ENSID}_internal_checkpoint
set old_rst = `/usr/bin/readlink -f $EXPDIR/input/restart/${rstf}${ENSID}_internal_rst`
/bin/rm -f $EXPDIR/input/restart/${rstf}${ENSID}_internal_rst
/bin/ln -s $tmp_file $EXPDIR/input/restart/${rstf}${ENSID}_internal_rst
set pert_rst = `grep -o "LANDPERT_INTERNAL_RESTART_FILE" LDAS.rc`
if ( $pert_rst == '' ) then
echo "LANDPERT_INTERNAL_RESTART_FILE: ../input/restart/landpert%s_internal_rst" >> LDAS.rc
/bin/mv ../run/LDAS.rc ../run/LDAS.rc.sgmt0
/bin/cp LDAS.rc ../run/LDAS.rc
endif
/usr/bin/gzip $old_rst &
endif

Expand Down Expand Up @@ -681,14 +690,18 @@ EOF
#######################################################################
# Update Iteration Counter
#######################################################################

set enddate = `echo $END_DATE | cut -c1-8`
set endhour = `echo $END_DATE | cut -c10-11`
set capdate = `cat cap_restart | cut -c1-8`

set caphour = `cat cap_restart | cut -c10-11`

if ( $capdate < $enddate ) then
@ counter = $counter + 1
@ counter = $counter + 1
else if ( $capdate == $enddate && $caphour < $endhour ) then
@ counter = $counter + 1
else
@ counter = ${NUM_SGMT} + 1
@ counter = ${NUM_SGMT} + 1
endif

## End of the while ( $counter <= ${NUM_SGMT} ) loop ##
Expand Down
17 changes: 15 additions & 2 deletions src/Applications/LDAS_App/tile_bin2nc4.F90
Original file line number Diff line number Diff line change
Expand Up @@ -384,9 +384,22 @@ FUNCTION getAttribute (SHORT_NAME, LNAME, UNT) result (str_atr)
case ('SNDZN1_INCR'); LONG_NAME = 'increment_snow_depth_layer_1'; UNITS = 'm'
case ('SNDZN2_INCR'); LONG_NAME = 'increment_snow_depth_layer_2'; UNITS = 'm'
case ('SNDZN3_INCR'); LONG_NAME = 'increment_snow_depth_layer_3'; UNITS = 'm'
!

! land assimilation forecast and analysis for Catchment model diagnostics

case ('SFMC_FCST'); LONG_NAME = 'soil_moisture_surface_forecast'; UNITS = 'm3 m-3'
case ('RZMC_FCST'); LONG_NAME = 'soil_moisture_rootzone_forecast'; UNITS = 'm3 m-3'
case ('PRMC_FCST'); LONG_NAME = 'soil_moisture_profile_forecast'; UNITS = 'm3 m-3'
case ('TSURF_FCST'); LONG_NAME = 'ave_catchment_temp_incl_snw_forecast'; UNITS = 'K'
case ('TSOIL1_FCST'); LONG_NAME = 'soil_temperatures_layer_1_forecast'; UNITS = 'K'
case ('SFMC_ANA'); LONG_NAME = 'soil_moisture_surface_analysis'; UNITS = 'm3 m-3'
case ('RZMC_ANA'); LONG_NAME = 'soil_moisture_rootzone_analysis'; UNITS = 'm3 m-3'
case ('PRMC_ANA'); LONG_NAME = 'soil_moisture_profile_analysis'; UNITS = 'm3 m-3'
case ('TSURF_ANA'); LONG_NAME = 'ave_catchment_temp_incl_snw_analysis'; UNITS = 'K'
case ('TSOIL1_ANA'); LONG_NAME = 'soil_temperatures_layer_1_analysis'; UNITS = 'K'

! default LONG_NAME and UNITS for nc4 files created by tile_bin2nc4.F90 (used for any SHORT_NAME not listed above):
!

case default; LONG_NAME = 'not defined in tile_bin2nc4.F90'; UNITS = 'not defined in tile_bin2nc4.F90';

end select
Expand Down
2 changes: 1 addition & 1 deletion src/Components/GEOSldas_GridComp/GEOS_LdasGridComp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ subroutine SetServices(gc, rc)
VERIFY_(status)

allocate(ens_id(NUM_ENSEMBLE),LAND(NUM_ENSEMBLE),LANDPERT(NUM_ENSEMBLE))
write (fmt_str, "(A2,I1,A1,I1,A1)") "(I", ens_id_width,".",ens_id_width,")"
write (fmt_str, "(A2,I1,A1,I1,A1)") "(I", ens_id_width,".",ens_id_width,")" ! BUG? only works for ens_id_width<10) (reichle, 11 Jun 2020)
do i=1,NUM_ENSEMBLE
ens_id(i) = i-1 + FIRST_ENS_ID ! id start form FIRST_ENS_ID
if(NUM_ENSEMBLE == 1 ) then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3257,12 +3257,12 @@ subroutine Collect_land_ens(gc, import, export, clock, rc)
if(associated(WCSF_enavg)) WCSF_enavg = WCSF_enavg/NUM_ENSEMBLE
if(associated(WCRZ_enavg)) WCRZ_enavg = WCRZ_enavg/NUM_ENSEMBLE
if(associated(WCPR_enavg)) WCPR_enavg = WCPR_enavg/NUM_ENSEMBLE
if(associated(TP1_enavg)) TP1_enavg = TP1_enavg/NUM_ENSEMBLE + MAPL_TICE
if(associated(TP2_enavg)) TP2_enavg = TP2_enavg/NUM_ENSEMBLE + MAPL_TICE
if(associated(TP3_enavg)) TP3_enavg = TP3_enavg/NUM_ENSEMBLE + MAPL_TICE
if(associated(TP4_enavg)) TP4_enavg = TP4_enavg/NUM_ENSEMBLE + MAPL_TICE
if(associated(TP5_enavg)) TP5_enavg = TP5_enavg/NUM_ENSEMBLE + MAPL_TICE
if(associated(TP6_enavg)) TP6_enavg = TP6_enavg/NUM_ENSEMBLE + MAPL_TICE
if(associated(TP1_enavg)) TP1_enavg = TP1_enavg/NUM_ENSEMBLE + MAPL_TICE ! convert to K
if(associated(TP2_enavg)) TP2_enavg = TP2_enavg/NUM_ENSEMBLE + MAPL_TICE ! convert to K
if(associated(TP3_enavg)) TP3_enavg = TP3_enavg/NUM_ENSEMBLE + MAPL_TICE ! convert to K
if(associated(TP4_enavg)) TP4_enavg = TP4_enavg/NUM_ENSEMBLE + MAPL_TICE ! convert to K
if(associated(TP5_enavg)) TP5_enavg = TP5_enavg/NUM_ENSEMBLE + MAPL_TICE ! convert to K
if(associated(TP6_enavg)) TP6_enavg = TP6_enavg/NUM_ENSEMBLE + MAPL_TICE ! convert to K
if(associated(EMIS_enavg)) EMIS_enavg = EMIS_enavg/NUM_ENSEMBLE
if(associated(ALBVR_enavg)) ALBVR_enavg = ALBVR_enavg/NUM_ENSEMBLE
if(associated(ALBVF_enavg)) ALBVF_enavg = ALBVF_enavg/NUM_ENSEMBLE
Expand Down
Loading