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.

Sign up for GitHub

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

Jump to bottom

Feature/add landpert rst file #276

Merged
merged 2 commits into from
Jul 15, 2020
Merged

Feature/add landpert rst file #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d57bb8
add landpert_restart_file even there is none
weiyuan-jiang Jul 8, 2020
e182b91
Merge branch 'develop' into feature/add_landpert_rst_file
weiyuan-jiang Jul 15, 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
6 changes: 3 additions & 3 deletions src/Applications/LDAS_App/ldas_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,9 +1033,6 @@ class LDASsetup:

rstkey=[catch_,'VEGDYN']
rstval=[self.catch,'vegdyn']
if((self.has_ldassa_pert or self.has_geos_pert) and self.perturb == 1) :
rstkey=[catch_,'VEGDYN','LANDPERT']
rstval=[self.catch,'vegdyn','landpert']

if self.has_mwrtm : # and _assim ==1 :
keyn='LANDASSIM_INTERNAL_RESTART_FILE'
Expand Down Expand Up @@ -1073,6 +1070,9 @@ class LDASsetup:
keyn = 'LANDPERT_INTERNAL_CHECKPOINT_FILE'
valn = 'landpert'+tmpl_+'_internal_checkpoint'
ldasrcInp[keyn]= valn
keyn = 'LANDPERT_INTERNAL_RESTART_FILE'
valn = '../input/restart/landpert'+tmpl_+'_internal_rst'
ldasrcInp[keyn]= valn


# write LDAS.rc
Expand Down
6 changes: 0 additions & 6 deletions src/Applications/LDAS_App/lenkf.j.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,12 +607,6 @@ EOF
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