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

Feature/msienkie/acft bc cleanup tails #139

Merged
merged 6 commits into from
Dec 13, 2021
Merged

Feature/msienkie/acft bc cleanup tails #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
427efa5
Adding 'cleanup_tails=.true.' to aircraft bias correction substitution
gmao-msienkie Nov 29, 2021
caa9f10
Added forgotten comma at the end of the modified substitution string
gmao-msienkie Nov 29, 2021
85c0554
Corrected spelling - the variable is cleanup_tail (without an 's')
gmao-msienkie Dec 3, 2021
d61fc58
Oops, I did it again - forgot to modify BOTH places where the
gmao-msienkie Dec 3, 2021
028dbde
Merge branch 'develop' into feature/msienkie/acftBC_cleanup_tails
gmao-msienkie Dec 6, 2021
a9e715b
Modify to allow selecting cleanup_tail option via
gmao-msienkie Dec 8, 2021
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
18 changes: 14 additions & 4 deletions src/Applications/GEOSdas_App/GEOSdas.csm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
# - Revise multi-incremental approach for 4d-analysis
# (cost goes down with successive updates)
# - Temporarily leaving test lines commented out
# 8Dec2021 Sienkiewicz - add option for 'cleanup_tail' for aircraft bias correction
#-----------------------------------------------------------------------------

#
Expand Down Expand Up @@ -115,6 +116,7 @@
if ( !($?BOOTSTRAP) ) setenv BOOTSTRAP 0
if ( !($?CENTRAL_AGCM_PARALLEL) ) setenv CENTRAL_AGCM_PARALLEL 0
if ( !($?CHECK_DMF) ) setenv CHECK_DMF 1
if ( !($?CLEANUP_TAIL) ) setenv CLEANUP_TAIL 0
if ( !($?CONVPROG) ) setenv CONVPROG 0
if ( !($?CONVSFC) ) setenv CONVSFC 0
if ( !($?CONVUPA) ) setenv CONVUPA 0
Expand Down Expand Up @@ -913,11 +915,15 @@ exit 1
echo 'Setting aircraft_t_bc_ext to true, using external bias correction'
breaksw
case 2:
echo "s/>>>AIRCFT_BIAS<<</aircraft_t_bc=.true.,/g" >> sed_file
set cftstring = "aircraft_t_bc=.true.,"
if ( $CLEANUP_TAIL ) set cftstring = "$cftstring cleanup_tail=.true.,"
echo "s/>>>AIRCFT_BIAS<<</$cftstring/g" >> sed_file
echo 'Setting aircraft_t_bc to true, using VV.VV^2 bias correction'
breaksw
case 3:
echo "s/>>>AIRCFT_BIAS<<</aircraft_t_bc_pof=.true.,/g" >> sed_file
set cftstring = "aircraft_t_bc_pof=.true.,"
if ( $CLEANUP_TAIL ) set cftstring = "$cftstring cleanup_tail=.true.,"
echo "s/>>>AIRCFT_BIAS<<</$cftstring/g" >> sed_file
echo 'Setting aircraft_t_bc_pof to true, using POF bias correction'
breaksw
default:
Expand Down Expand Up @@ -1128,11 +1134,15 @@ exit 1
echo 'Setting aircraft_t_bc_ext to true, using external bias correction'
breaksw
case 2:
echo "s/>>>AIRCFT_BIAS<<</aircraft_t_bc=.true.,/g" >> sed_file
set cftstring = "aircraft_t_bc=.true.,"
if ( $CLEANUP_TAIL ) set cftstring = "$cftstring cleanup_tail=.true.,"
echo "s/>>>AIRCFT_BIAS<<</$cftstring/g" >> sed_file
echo 'Setting aircraft_t_bc to true, using VV.VV^2 bias correction'
breaksw
case 3:
echo "s/>>>AIRCFT_BIAS<<</aircraft_t_bc_pof=.true.,/g" >> sed_file
set cftstring = "aircraft_t_bc_pof.true.,"
if ( $CLEANUP_TAIL ) set cftstring = "$cftstring cleanup_tail=.true.,"
echo "s/>>>AIRCFT_BIAS<<</$cftstring/g" >> sed_file
echo 'Setting aircraft_t_bc_pof to true, using POF bias correction'
breaksw
default:
Expand Down
18 changes: 14 additions & 4 deletions src/Applications/GSI_App/fvssi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
if ( !($?ANA4DUPD_IAU0_ONLY) ) setenv ANA4DUPD_IAU0_ONLY 0 # assume 4d increment
if ( !($?ANGLEBC) ) setenv ANGLEBC 0
if ( !($?BATCH_SUBCMD) ) setenv BATCH_SUBCMD "sbatch"
if ( !($?CLEANUP_TAIL) ) setenv CLEANUP_TAIL 0
if ( !($?DATAMOVE_CONSTRAINT) ) setenv DATAMOVE_CONSTRAINT NULL
if ( !($?INCSENS) ) setenv INCSENS 0
if ( !($?GSI_NETCDF_DIAG) ) setenv GSI_NETCDF_DIAG 0
Expand Down Expand Up @@ -742,11 +743,15 @@
echo 'Setting aircraft_t_bc_ext to true, using external bias correction'
breaksw
case 2:
echo "s/>>>AIRCFT_BIAS<<</aircraft_t_bc=.true.,/g" >> sed_file
set cftstring = "aircraft_t_bc=.true.,"
if ( $CLEANUP_TAIL ) set cftstring = "$cftstring cleanup_tail=.true.,"
echo "s/>>>AIRCFT_BIAS<<</$cftstring/g" >> sed_file
echo 'Setting aircraft_t_bc to true, using VV.VV^2 bias correction'
breaksw
case 3:
echo "s/>>>AIRCFT_BIAS<<</aircraft_t_bc_pof=.true.,/g" >> sed_file
set cftstring = "aircraft_t_bc_pof=.true.,"
if ( $CLEANUP_TAIL ) set cftstring = "$cftstring cleanup_tail=.true.,"
echo "s/>>>AIRCFT_BIAS<<</$cftstring/g" >> sed_file
echo 'Setting aircraft_t_bc_pof to true, using POF bias correction'
breaksw
default:
Expand Down Expand Up @@ -842,11 +847,15 @@
echo 'Setting aircraft_t_bc_ext to true, using external bias correction'
breaksw
case 2:
echo "s/>>>AIRCFT_BIAS<<</aircraft_t_bc=.true.,/g" >> sed_file
set cftstring = "aircraft_t_bc=.true.,"
if ( $CLEANUP_TAIL ) set cftstring = "$cftstring cleanup_tail=.true.,"
echo "s/>>>AIRCFT_BIAS<<</$cftstring/g" >> sed_file
echo 'Setting aircraft_t_bc to true, using VV.VV^2 bias correction'
breaksw
case 3:
echo "s/>>>AIRCFT_BIAS<<</aircraft_t_bc_pof=.true.,/g" >> sed_file
set cftstring = "aircraft_t_bc_pof=.true.,"
if ( $CLEANUP_TAIL ) set cftstring = "$cftstring cleanup_tail=.true.,"
echo "s/>>>AIRCFT_BIAS<<</$cftstring/g" >> sed_file
echo 'Setting aircraft_t_bc_pof to true, using POF bias correction'
breaksw
default:
Expand Down Expand Up @@ -984,6 +993,7 @@ ENVIRONMENT VARIABLES
ENVIRONMENT VARIABLES (optional)

ACFTBIAS sets aircraft bias correction
CLEANUP_TAIL triggers cleanup of aircraft coefficient file
ANASENS trigger for analysis sensitivity (obs impact)
INCSENS allows running adjoint GSI with analysis increment for input
DO4DVAR trigger for 4DVAR-related features
Expand Down