Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/aelakkra/m21c_rewndfixes…
Browse files Browse the repository at this point in the history 
…' into R21C
  • Loading branch information
@sdrabenh
sdrabenh committed Jul 22, 2024
2 parents 70541ea + 2197eca commit cc81dda
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 33 deletions.
3 changes: 2 additions & 1 deletion src/Applications/GEOSdas_App/edhist.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1372,7 +1372,8 @@ sub add_silo_mstorage_traits {
_odt_ _qdt_ _rad_ _slv_ _tdt_ _tmp_ _trb_ _udt_ _wnd_
asm_ cld_ csp_ dyn_ ext_ flx_ glc_
hwl_ int_ lfo_ lnd_ lsf_ met_ mst_ ocn_
odt_ qdt_ rad_ slv_ tdt_ tmp_ trb_ udt_ wnd_ );
odt_ qdt_ rad_ slv_ tdt_ tmp_ trb_ udt_ wnd_
lmv_ lmf_ ocf_ trc_ fwi_ pbl_ slv_ );
@progID = qw( prog traj ptrj );

# add silo trait if not present
Expand Down
2 changes: 1 addition & 1 deletion src/Applications/GEOSdas_App/monthly_means.j.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ source $rundir/FVDAS_Run_Config
set path = ( $FVHOME/run $FVROOT/bin $BASEDIR/$ARCH/bin $path )

set echo
setenv MONTHLY_X "$FVROOT/bin/time_ave.x"
setenv MONTHLY_X "$FVROOT/bin/time_ave_util.x"

# set variables, if not specified
#--------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/Applications/GEOSdas_App/monthly_means.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ sub init {

# check monthly means program
#----------------------------
$monthly_means_x = "$fvroot/bin/time_ave.x" unless $monthly_means_x;
$monthly_means_x = "$fvroot/bin/time_ave_util.x" unless $monthly_means_x;
die "Error: monthly_means_x is required. Use -M;" unless -e $monthly_means_x;
die "Error: $monthly_means_x not executable;" unless -x $monthly_means_x;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Applications/GEOSdas_App/write_FVDAS_Run_Config.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ sub init {
$FVWORK = "$TMPDIR/fvwork.\$\$";
$GRADS_CONFIG = "\$FVSHARE/opengrads/setup.csh 1.9.8" if $FVSHARE;
$LIBSZ = "\$BASEDIR/\$ARCH/lib";
$MONTHLY_X = "\$FVROOT/bin/time_ave.x";
$MONTHLY_X = "\$FVROOT/bin/time_ave_util.x";

# substitute variables for values
#--------------------------------
Expand Down
81 changes: 54 additions & 27 deletions src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/HISTAENS.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
'glc_tavg_6hr_glo_L288x181_slv'
'aer_inst_6hr_glo_L288x181_slv'
'int_inst_6hr_glo_L288x181_slv'
'int_tavg_6hr_glo_L288x181_slv'
'pbl_inst_6hr_glo_L288x181_z17'
'bkg.eta'
'bkg.sfc'
Expand All @@ -48,8 +49,8 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
# asm collections

asm_inst_6hr_glo_L288x181_p48.format: 'CFIO' ,
asm_inst_6hr_glo_L288x181_p48.descr: '3d,6-Hourly,Instantaneous,Pressure-Level,Assimilation Fields (wind,temperature)' ,
asm_inst_6hr_glo_L288x181_p48.nbits: 10 ,
asm_inst_6hr_glo_L288x181_p48.descr: '3d,6-Hourly,Instantaneous,Pressure-Level,Assimilation,Ensemble Assimilation Fields' ,
asm_inst_6hr_glo_L288x181_p48.nbits: 12 ,
asm_inst_6hr_glo_L288x181_p48.deflate: 2 ,
asm_inst_6hr_glo_L288x181_p48.regrid_method: 'BILINEAR_MONOTONIC' ,
asm_inst_6hr_glo_L288x181_p48.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
Expand Down Expand Up @@ -82,8 +83,8 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'


slv_inst_6hr_glo_L288x181_slv.format: 'CFIO' ,
slv_inst_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Instantaneous,Single-Level,Assimilation,Single-Level Diagnostics' ,
slv_inst_6hr_glo_L288x181_slv.nbits: 10 ,
slv_inst_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Instantaneous,Single-Level,Assimilation,Ensemble Single-Level Diagnostics' ,
slv_inst_6hr_glo_L288x181_slv.nbits: 12 ,
slv_inst_6hr_glo_L288x181_slv.deflate: 2 ,
slv_inst_6hr_glo_L288x181_slv.regrid_method: 'BILINEAR_MONOTONIC' ,
slv_inst_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
Expand Down Expand Up @@ -141,8 +142,8 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'


flx_tavg_6hr_glo_L288x181_slv.format: 'CFIO' ,
flx_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Surface Flux Diagnostics' ,
flx_tavg_6hr_glo_L288x181_slv.nbits: 10 ,
flx_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Ensemble Surface Flux Diagnostics' ,
flx_tavg_6hr_glo_L288x181_slv.nbits: 12 ,
flx_tavg_6hr_glo_L288x181_slv.deflate: 2 ,
flx_tavg_6hr_glo_L288x181_slv.regrid_method: 'BILINEAR_MONOTONIC' ,
flx_tavg_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
Expand Down Expand Up @@ -183,13 +184,13 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
'FRACI' , 'SURFACE' , 'FRSEAICE' ,
# Additional variables
'OFRACI' , 'SURFACE' , 'AICE' ,
'RUNOFF' , 'SURFACE' , 'RUNOFFTOT' , # total runoff from glc & lnd ,
'RUNOFF' , 'SURFACE' , 'RUNOFFTOT' ,
'AN_PRCP' , 'MOIST' , 'PRECANV' ,
'CN_PRCP' , 'MOIST' , 'PRECCON' ,
'LS_PRCP' , 'MOIST' , 'PRECLSC' ,
'SNO' , 'MOIST' , 'PRECSNO' ,
'TPREC' , 'MOIST' , 'PRECTOT' ,
'PRECTOT' , 'SURFACE' , 'PRECTOTCORR' , # append "CORR" if reanalysis and from SURFACE ,
'PRECTOT' , 'SURFACE' , 'PRECTOTCORR' ,
'PGENTOT' , 'MOIST' ,
'PREVTOT' , 'MOIST' ,
'LS_ARF' , 'MOIST' , 'FRCLS' ,
Expand All @@ -200,8 +201,8 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
::

rad_tavg_6hr_glo_L288x181_slv.format: 'CFIO' ,
rad_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Radiation Diagnostics' ,
rad_tavg_6hr_glo_L288x181_slv.nbits: 10 ,
rad_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Ensemble Radiation Diagnostics' ,
rad_tavg_6hr_glo_L288x181_slv.nbits: 12 ,
rad_tavg_6hr_glo_L288x181_slv.deflate: 2 ,
rad_tavg_6hr_glo_L288x181_slv.regrid_method: 'BILINEAR_MONOTONIC' ,
rad_tavg_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
Expand Down Expand Up @@ -255,8 +256,8 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
::

lnd_tavg_6hr_glo_L288x181_slv.format: 'CFIO' ,
lnd_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Land Surface Diagnostics' ,
# lnd_tavg_6hr_glo_L288x181_slv.nbits: 10 ,
lnd_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Ensemble Land Surface Diagnostics' ,
# lnd_tavg_6hr_glo_L288x181_slv.nbits: 12 ,
lnd_tavg_6hr_glo_L288x181_slv.deflate: 2 ,
lnd_tavg_6hr_glo_L288x181_slv.regrid_method: 'BILINEAR_MONOTONIC' ,
lnd_tavg_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
Expand Down Expand Up @@ -287,8 +288,8 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
'TSOIL4' , 'SURFACE' ,
'TSOIL5' , 'SURFACE' ,
'TSOIL6' , 'SURFACE' ,
'PRLAND' , 'SURFACE' , 'PRECTOTCORR' , # append "CORR" if reanalysis and from SURFACE ,
'SNOLAND' , 'SURFACE' , 'PRECSNOCORR' , # append "CORR" if reanalysis and from SURFACE ,
'PRLAND' , 'SURFACE' , 'PRECTOTCORR' ,
'SNOLAND' , 'SURFACE' , 'PRECSNOCORR' ,
'TSLAND' , 'SURFACE' , 'SNOMASLAND' ,
'SNOWDP' , 'SURFACE' , 'SNODPLAND' ,
'EVPSOI' , 'SURFACE' , 'EVPLANDSOIL' ,
Expand Down Expand Up @@ -321,8 +322,8 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
::

lfo_tavg_6hr_glo_L288x181_slv.format: 'CFIO' ,
lfo_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Land Surface Forcings' ,
# lfo_tavg_6hr_glo_L288x181_slv.nbits: 10 ,
lfo_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Ensemble Land Surface Forcings' ,
# lfo_tavg_6hr_glo_L288x181_slv.nbits: 12 ,
lfo_tavg_6hr_glo_L288x181_slv.deflate: 2 ,
lfo_tavg_6hr_glo_L288x181_slv.regrid_method: 'BILINEAR_MONOTONIC' ,
lfo_tavg_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
Expand All @@ -335,16 +336,16 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
lfo_tavg_6hr_glo_L288x181_slv.end_time: >>>IOETIME<<< ,
lfo_tavg_6hr_glo_L288x181_slv.fields: 'SLRSF' , 'SOLAR' , 'SWGDN' ,
'LWS' , 'IRRAD' , 'LWGAB' ,
'PCU' , 'SURFACE' , 'PRECRAINCUCORR' , # append "CORR" if reanalysis and from SURFACE ,
'PLS' , 'SURFACE' , 'PRECRAINLSCORR' , # append "CORR" if reanalysis and from SURFACE ,
'SNO' , 'SURFACE' , 'PRECSNOCORR' , # append "CORR" if reanalysis and from SURFACE ,
'PCU' , 'SURFACE' , 'PRECRAINCUCORR' ,
'PLS' , 'SURFACE' , 'PRECRAINLSCORR' ,
'SNO' , 'SURFACE' , 'PRECSNOCORR' ,
'DFPAR' , 'SOLAR' , 'PARDF' ,
'DRPAR' , 'SOLAR' , 'PARDR' ,
::

glc_tavg_6hr_glo_L288x181_slv.format: 'CFIO' ,
glc_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Land Ice Surface Diagnostics' ,
glc_tavg_6hr_glo_L288x181_slv.nbits: 10 ,
glc_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Ensemble Land Ice Surface Diagnostics' ,
glc_tavg_6hr_glo_L288x181_slv.nbits: 12 ,
glc_tavg_6hr_glo_L288x181_slv.deflate: 2 ,
glc_tavg_6hr_glo_L288x181_slv.regrid_method: 'BILINEAR_MONOTONIC' ,
glc_tavg_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
Expand Down Expand Up @@ -384,8 +385,8 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
::

int_inst_6hr_glo_L288x181_slv.format: 'CFIO' ,
int_inst_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Instantaneous,Single-Level,Assimilation,Vertically Integrated Diagnostics' ,
int_inst_6hr_glo_L288x181_slv.nbits: 10 ,
int_inst_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Instantaneous,Single-Level,Assimilation,Ensemble Vertically Integrated Diagnostics' ,
int_inst_6hr_glo_L288x181_slv.nbits: 12 ,
int_inst_6hr_glo_L288x181_slv.deflate: 2 ,
int_inst_6hr_glo_L288x181_slv.regrid_method: 'BILINEAR_MONOTONIC' ,
int_inst_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
Expand All @@ -405,9 +406,35 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
'THV' , 'AGCM' ,
::

int_tavg_6hr_glo_L288x181_slv.format: 'CFIO' ,
int_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Assimilation,Vertically Integrated Ensemble Diagnostics' ,
int_tavg_6hr_glo_L288x181_slv.nbits: 12 ,
int_tavg_6hr_glo_L288x181_slv.deflate: 2 ,
int_tavg_6hr_glo_L288x181_slv.regrid_method: 'BILINEAR_MONOTONIC' ,
int_tavg_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
int_tavg_6hr_glo_L288x181_slv.mode: 'time-averaged' ,
int_tavg_6hr_glo_L288x181_slv.grid_label: PC288x181-DC ,
int_tavg_6hr_glo_L288x181_slv.frequency: 060000 ,
int_tavg_6hr_glo_L288x181_slv.duration: 060000 ,
int_tavg_6hr_glo_L288x181_slv.end_date: >>>IOEDATE<<< ,
int_tavg_6hr_glo_L288x181_slv.end_time: >>>IOETIME<<< ,
int_tavg_6hr_glo_L288x181_slv.fields: 'UCPT' , 'DYN' , 'UFLXCPT' ,
'VCPT' , 'DYN' , 'VFLXCPT' ,
'UPHI' , 'DYN' , 'UFLXPHI' ,
'VPHI' , 'DYN' , 'VFLXPHI' ,
'UKE' , 'DYN' , 'UFLXKE' ,
'VKE' , 'DYN' , 'VFLXKE' ,
'UQV' , 'DYN' , 'UFLXQV' ,
'VQV' , 'DYN' , 'VFLXQV' ,
'UQL' , 'DYN' , 'UFLXQL' ,
'VQL' , 'DYN' , 'VFLXQL' ,
'UQI' , 'DYN' , 'UFLXQI' ,
'VQI' , 'DYN' , 'VFLXQI' ,
::

aer_inst_6hr_glo_L288x181_slv.format: 'CFIO' ,
aer_inst_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Instantaneous,Single-Level,Analysis,Aerosol Diagnostics' ,
aer_inst_6hr_glo_L288x181_slv.nbits: 10 ,
aer_inst_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Instantaneous,Single-Level,Analysis,Ensemble Aerosol Diagnostics' ,
aer_inst_6hr_glo_L288x181_slv.nbits: 12 ,
aer_inst_6hr_glo_L288x181_slv.deflate: 2 ,
aer_inst_6hr_glo_L288x181_slv.regrid_method: 'CONSERVE_MONOTONIC' ,
aer_inst_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
Expand All @@ -426,8 +453,8 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
::

pbl_inst_6hr_glo_L288x181_z17.format: 'CFIO' ,
pbl_inst_6hr_glo_L288x181_z17.descr: '3d,6-Hourly,Instantaneous,Constant-Height,PBL Diagnostics' ,
pbl_inst_6hr_glo_L288x181_z17.nbits: 10 ,
pbl_inst_6hr_glo_L288x181_z17.descr: '3d,6-Hourly,Instantaneous,Constant-Height,Assimilation, Ensemble PBL Diagnostics' ,
pbl_inst_6hr_glo_L288x181_z17.nbits: 12 ,
pbl_inst_6hr_glo_L288x181_z17.deflate: 2 ,
pbl_inst_6hr_glo_L288x181_z17.regrid_method: 'BILINEAR_MONOTONIC' ,
pbl_inst_6hr_glo_L288x181_z17.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
Expand Down
2 changes: 2 additions & 0 deletions src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/atmos_enkf.nml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@
sattypes_rad(77)= 'atms_n20', dsis(77)= 'atms_n20',
sattypes_rad(78)= 'amsr2_gcom-w1', dsis(78)= 'amsr2_gcom-w1',
sattypes_rad(79)= 'atms_n21', dsis(79)= 'atms_n21',
sattypes_rad(80)= 'ssu_n11', dsis(80)= 'ssu_n11',
sattypes_rad(81)= 'ssu_n14', dsis(81)= 'ssu_n14',
/
&ozobs_enkf
sattypes_oz(1) = 'sbuv8_n11',
Expand Down
3 changes: 2 additions & 1 deletion src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/obs1gsi_mean.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ OBS_INPUT::
prepbufrt uv null uv 0.0 0 0 r21c_prep_bufr
prepbufrt_profl t prof t 0.0 0 0 r21c_acftpfl_bufr
prepbufrt_profl uv prof uv 0.0 0 0 r21c_acftpfl_bufr
loonwinds uv null uv 0.0 0 0 r21c_loon_winds
loonwinds uv null uv 0.0 0 0 r21c_loon_bufr
mlstbufr t aura t 0.0 0 0 r21c_gmao_mlst_bufr
gpsrobufr gps_bnd null gps 0.0 0 0 r21c_gpsro_bufr
tcvitl tcp null tcp 0.0 0 0 r21c_ncep_tcvitals
Expand Down Expand Up @@ -115,6 +115,7 @@ OBS_INPUT::
msubufr msu n11 msu_n11 0.0 1 0 r21c_1bmsu_bufr
msubufr msu n12 msu_n12 0.0 1 0 r21c_1bmsu_bufr
msubufr msu n14 msu_n14 0.0 1 0 r21c_1bmsu_bufr
ssubufr ssu n11 ssu_n11 0.0 1 0 r21c_1bssu_bufr
ssubufr ssu n14 ssu_n14 0.0 1 0 r21c_1bssu_bufr
amsuabufr amsua n15 amsua_n15 0.0 1 0 r21c_1bamua_bufr
amsuabufr amsua n16 amsua_n16 0.0 1 0 r21c_1bamua_bufr
Expand Down
3 changes: 2 additions & 1 deletion src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/obs1gsi_member.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ OBS_INPUT::
prepbufrt uv null uv 0.0 0 0 r21c_prep_bufr
prepbufrt_profl t prof t 0.0 0 0 r21c_acftpfl_bufr
prepbufrt_profl uv prof uv 0.0 0 0 r21c_acftpfl_bufr
loonwinds uv null uv 0.0 0 0 r21c_loon_winds
loonwinds uv null uv 0.0 0 0 r21c_loon_bufr
mlstbufr t aura t 0.0 0 0 r21c_gmao_mlst_bufr
gpsrobufr gps_bnd null gps 0.0 0 0 r21c_gpsro_bufr
tcvitl tcp null tcp 0.0 0 0 r21c_ncep_tcvitals
Expand Down Expand Up @@ -115,6 +115,7 @@ OBS_INPUT::
msubufr msu n11 msu_n11 0.0 1 0 r21c_1bmsu_bufr
msubufr msu n12 msu_n12 0.0 1 0 r21c_1bmsu_bufr
msubufr msu n14 msu_n14 0.0 1 0 r21c_1bmsu_bufr
ssubufr ssu n11 ssu_n11 0.0 1 0 r21c_1bssu_bufr
ssubufr ssu n14 ssu_n14 0.0 1 0 r21c_1bssu_bufr
amsuabufr amsua n15 amsua_n15 0.0 1 0 r21c_1bamua_bufr
amsuabufr amsua n16 amsua_n16 0.0 1 0 r21c_1bamua_bufr
Expand Down
1 change: 1 addition & 0 deletions src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/post_egcm.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ COLLECTIONS::
'glc_tavg_6hr_glo_L288x181_slv'
'aer_tavg_6hr_glo_L288x181_slv'
'int_inst_6hr_glo_L288x181_slv'
'int_tavg_6hr_glo_L288x181_slv'
'pbl_inst_6hr_glo_L288x181_z17'
::

0 comments on commit cc81dda

Please sign in to comment.