Skip to content

Commit

Permalink
Merge pull request #217 from GEOS-ESM/bugfix/rtodling/geosit_30sep2022
Browse files Browse the repository at this point in the history 
minor fixes for GEOSIT - one fix for FP (EnKF)
  • Loading branch information
@rtodling
rtodling authored Oct 3, 2022
2 parents 4edc5dd + f3a1383 commit a9623a9
Show file tree
Hide file tree
Showing 7 changed files with 530 additions and 499 deletions.
4 changes: 2 additions & 2 deletions components.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ FMS:
GEOSana_GridComp:
local: ./src/Components/@GEOSana_GridComp
remote: ../GEOSana_GridComp.git
tag: v1.5.4.6
tag: v1.5.4.7
develop: develop

GEOSgcm_GridComp:
Expand All @@ -71,7 +71,7 @@ GEOSagcmPert_GridComp:
FVdycoreCubed_GridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
remote: ../FVdycoreCubed_GridComp.git
tag: v1.2.15
tag: v1.2.15.1
develop: develop

fvdycore:
Expand Down
4 changes: 2 additions & 2 deletions src/Applications/GEOSdas_App/edhist.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1363,8 +1363,8 @@ sub add_silo_mstorage_traits {
my (@anaID, @chemID, @diagID, @progID, $name, $storage);

@anaID = qw( vtx .eta .sfc .prs );
@chemID = qw( _adg_ _aer_ _chm_ _gas_ _nav_ _tag_
adg_ aer_ chm_ gas_ nav_ tag_ );
@chemID = qw( _adg_ _aer_ _ctm_ _chm_ _gas_ _nav_ _tag_
adg_ aer_ ctm_ chm_ gas_ nav_ tag_ );
@diagID = qw( _asm_ _chm_ _cld_ _csp_ _dyn_ _ext_ _flx_ _glc_
_hwl_ _int_ _lfo_ _lnd_ _lsf_ _met_ _mst_ _ocn_
_odt_ _qdt_ _rad_ _slv_ _tdt_ _tmp_ _trb_ _udt_ _wnd_
Expand Down
4 changes: 2 additions & 2 deletions src/Applications/GEOSdas_App/monthly.yyyymm.pl.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ my ($walltime_cl, $walltime_mm, $walltime_mp, $walltime_pf);
my ($partition, $qos, $runlocal);
my ($datamove_constraint);

$partition = "preops";
$qos = "dastest";
#$partition = "preops";
#$qos = "dastest";

my %valid = ( "fetch" => 1,
"means" => 1,
Expand Down
4 changes: 2 additions & 2 deletions src/Applications/GEOSdas_App/testsuites/geos_it.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Which main class of ObsSys (1: NRT; 2: MERRA; 3: MERRA-2; 4: GEOS-IT; 5: R21C)?
> 4

OBSERVING SYSTEM CLASSES?
> geosit_cdas_raob_pre-qc_bufr,geosit_cdas_conv_pre-qc_bufr,geosit_prof_pre-qc_bufr,geosit_avhrrwnd_pre-qc_bufr,geosit_nmodis_pre-qc_bufr,geosit_goes_pre-qc_prep_bufr,geosit_metsat_pre-qc_prep_bufr,geosit_jma_pre-qc_prep_bufr,geosit_ascat_pre-qc_bufr,geosit_repro_ers2_pre-qc_bufr,geosit_qscat_jpl_pre-qc_bufr,geosit_wspd_pre-qc_bufr,geosit_satwnd_bufr,geosit_avhrr_satwnd_bufr,geosit_ncep_tcvitals,geosit_tmi_bufr,geosit_gpsro_bufr,geosit_sevcsr_bufr,geosit_1bamua_bufr,geosit_1bamub_bufr,geosit_1bhrs2_bufr,geosit_1bhrs3_bufr,geosit_1bhrs4_bufr,geosit_1bmsu_bufr,geosit_1bmhs_bufr,geosit_1bssu_bufr,geosit_eosairs_bufr,geosit_eosamsua_bufr,geosit_mtiasi_bufr,geosit_atms_bufr,geosit_ssmit11_bufr,geosit_ssmit13_bufr,geosit_ssmit14_bufr,geosit_ssmit15_bufr,geosit_amsre_bufr,geosit_osbuv8_bufr,geosit_npp_ompsnp_nc,geosit_aura_omieff_nc,geosit_npp_ompsnmeff_nc,geosit_avcsam_bufr,geosit_avcspm_bufr,geosit_acftpfl_bufr,geosit_amsr2_bufr,geosit_crisfsr_bufr,geosit_gmi_bufr,geosit_prep_bufr
> geosit_cdas_raob_pre-qc_bufr,geosit_cdas_conv_pre-qc_bufr,geosit_prof_pre-qc_bufr,geosit_avhrrwnd_pre-qc_bufr,geosit_nmodis_pre-qc_bufr,geosit_goes_pre-qc_prep_bufr,geosit_metsat_pre-qc_prep_bufr,geosit_jma_pre-qc_prep_bufr,geosit_ascat_pre-qc_bufr,geosit_repro_ers2_pre-qc_bufr,geosit_qscat_jpl_pre-qc_bufr,geosit_satwnd_bufr,geosit_avhrr_satwnd_bufr,geosit_ncep_tcvitals,geosit_tmi_bufr,geosit_gpsro_bufr,geosit_sevcsr_bufr,geosit_1bamua_bufr,geosit_1bamub_bufr,geosit_1bhrs2_bufr,geosit_1bhrs3_bufr,geosit_1bhrs4_bufr,geosit_1bmsu_bufr,geosit_1bmhs_bufr,geosit_eosairs_bufr,geosit_eosamsua_bufr,geosit_mtiasi_bufr,geosit_atms_bufr,geosit_ssmit11_bufr,geosit_ssmit13_bufr,geosit_ssmit14_bufr,geosit_ssmit15_bufr,geosit_amsre_bufr,geosit_osbuv8_bufr,geosit_npp_ompsnp_nc,geosit_aura_omieff_nc,geosit_npp_ompsnmeff_nc,geosit_avcsam_bufr,geosit_avcspm_bufr,geosit_acftpfl_bufr,geosit_amsr2_bufr,geosit_crisfsr_bufr,geosit_gmi_bufr,geosit_prep_bufr

CHECKING OBSYSTEM? [2]
> 1
Expand Down Expand Up @@ -195,7 +195,7 @@ Do Aerosol Analysis (y/n)? [y]
>

AOD OBSERVING CLASSES [or type 'none']?
> mod04_061_his,myd04_061_his,aeronet_obs
> patmosx_ods,mod04_061_flk,myd04_061_flk,mod04_061_his,myd04_061_his,aeronet_obs

Enable GAAS feedback to model (y/n)? [y]
>
Expand Down
31 changes: 30 additions & 1 deletion src/Applications/GEOSdas_App/write_monthly_rc_arc.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,36 @@
"traj.lcv" => 1,
"bkg_clcv_rst" => 1,
"vtx.mix" => 1,
"vtx.prs" => 1 );
"vtx.prs" => 1,
"asm_inst_3hr_glo_C180x180x6_v72" => 1,
"asm_tavg_3hr_glo_C180x180x6_v72" => 1,
"asm_inst_1hr_glo_C180x180x6_slv" => 1,
"cld_tavg_3hr_glo_C180x180x6_v72" => 1,
"mst_tavg_3hr_glo_C180x180x6_v73" => 1,
"mst_tavg_3hr_glo_C180x180x6_v72" => 1,
"rad_tavg_3hr_glo_C180x180x6_v72" => 1,
"trb_tavg_3hr_glo_C180x180x6_v73" => 1,
"tdt_tavg_3hr_glo_C180x180x6_v72" => 1,
"udt_tavg_3hr_glo_C180x180x6_v72" => 1,
"qdt_tavg_3hr_glo_C180x180x6_v72" => 1,
"odt_tavg_3hr_glo_C180x180x6_v72" => 1,
"slv_tavg_1hr_glo_C180x180x6_slv" => 1,
"flx_tavg_1hr_glo_C180x180x6_slv" => 1,
"rad_tavg_1hr_glo_C180x180x6_slv" => 1,
"lnd_tavg_1hr_glo_C180x180x6_slv" => 1,
"lfo_tavg_1hr_glo_C180x180x6_slv" => 1,
"lfo_inst_1hr_glo_C180x180x6_slv" => 1,
"ocn_tavg_1hr_glo_C180x180x6_slv" => 1,
"aer_inst_3hr_glo_C180x180x6_v72" => 1,
"chm_inst_3hr_glo_C180x180x6_v72" => 1,
"aer_tavg_3hr_glo_C180x180x6_slv" => 1,
"adg_tavg_3hr_glo_C180x180x6_slv" => 1,
"chm_tavg_3hr_glo_C180x180x6_slv" => 1,
"nav_tavg_3hr_glo_C180x180x6_v72" => 1,
"nav_tavg_3hr_glo_C180x180x6_v73" => 1,
"ctm_tavg_1hr_glo_C180x180x6_v72" => 1,
"ctm_inst_1hr_glo_C180x180x6_v72" => 1,
"asm_const_0hr_glo_C180x180x6_slv" => 1 );
# main program
#-------------
{
Expand Down
Loading

0 comments on commit a9623a9

Please sign in to comment.