Skip to content

Commit

Permalink
Merge branch 'develop' into feature/jstassi/#83/#119/AOD-parallel-and…
Browse files Browse the repository at this point in the history 
…-runjob-consistency-check
  • Loading branch information
@rtodling
rtodling authored Dec 13, 2021
2 parents 1f3f933 + 7cca58e commit c689e65
Show file tree
Hide file tree
Showing 33 changed files with 46,776 additions and 11,421 deletions.
18 changes: 14 additions & 4 deletions src/Applications/GEOSdas_App/GEOSdas.csm
View file
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
3 changes: 0 additions & 3 deletions src/Applications/GEOSdas_App/fvsetup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,17 +801,14 @@ sub defaults {
gsi_sens.rc.tmpl
noreplay.acq
odsmatch.rc
prepobs_acarsqc.merra.parm
prepobs_cqc_statbge
prepobs_cqcbufr.merra.parm
prepobs_errtable.global
prepobs_landc
prepobs_oiqc.oberrs
prepobs_prep.bufrtable
prepobs_prepacqc.merra.parm
prepobs_prevents.merra.parm
prepobs_profcqc.merra.parm
prepobs_waypoints
sac.nl.tmpl
vtrack.ctl.tmpl
vtrack.rc
Expand Down
18 changes: 14 additions & 4 deletions src/Applications/GSI_App/fvssi
View file
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
Loading

0 comments on commit c689e65

Please sign in to comment.