Skip to content

Commit

Permalink
Merge branch 'R21C' into bugfix/rtodling/gmi_fix_r21c
Browse files Browse the repository at this point in the history
  • Loading branch information
@rtodling
rtodling authored Jul 8, 2024
2 parents d0635a3 + 40b2ba5 commit 43654a2
Show file tree
Hide file tree
Showing 13 changed files with 46 additions and 30 deletions.
12 changes: 6 additions & 6 deletions components.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ NCEP_Shared:
GMAO_Shared:
local: ./src/Shared/@GMAO_Shared
remote: ../GMAO_Shared.git
tag: v1.7.2+R21C_v1.0.0
tag: v1.7.2+R21C_v1.0.1
develop: R21C

GEOS_Util:
Expand All @@ -40,7 +40,7 @@ GEOS_Util:
MAPL:
local: ./src/Shared/@MAPL
remote: ../MAPL.git
tag: v2.35.3+R21C_v1.0.0
tag: v2.35.3+R21C_v1.1.0
develop: R21C

FMS:
Expand All @@ -58,9 +58,9 @@ GEOSana_GridComp:
GEOSgcm_GridComp:
local: ./src/Components/@GEOSgcm_GridComp
remote: ../GEOSgcm_GridComp.git
tag: v1.18.1
tag: v1.18.1+R21C_v1.0.1
sparse: ./config/GEOSgcm_GridComp.sparse
develop: release/v1
develop: R21C

g5pert:
local: ./src/Components/@g5pert
Expand Down Expand Up @@ -107,7 +107,7 @@ geos-chem:
GOCART:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART
remote: ../GOCART.git
tag: v2.1.2+R21C_v1.0.0
tag: v2.1.2+R21C_v1.0.2
develop: R21C

QuickChem:
Expand Down Expand Up @@ -182,7 +182,7 @@ RRTMGP:
GEOSgcm_App:
local: ./src/Applications/@GEOSgcm_App
remote: ../GEOSgcm_App.git
tag: v1.9.6+R21C_v1.0.0
tag: v1.9.6+R21C_v1.0.3
develop: R21C

Ocean-LETKF:
Expand Down
3 changes: 2 additions & 1 deletion src/Applications/GEOSdas_App/AGCMrc.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ my %list = (rs5_core => \@rs5_core,
tr_import_rst
turb_internal_rst
turb_import_rst
gwd_import_rst );
gwd_import_rst
igni_internal_rst);

# warn but do not abort if these restarts are not present
@rs5_others = qw ( ana_satbang_rst
Expand Down
4 changes: 3 additions & 1 deletion src/Applications/GEOSdas_App/edhist.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,9 @@ sub plot_edit {
foreach $name (@topList) {
$name =~ s/_NCKS$//;
next unless $name =~ m/Cp$/ or $name =~ m/Np$/ or $name =~ m/Nx$/
or $name =~ m/slv$/ or $name =~ m/p42$/;
or $name =~ m/slv$/ or $name =~ m/p42$/
or $name =~ m/p48$/ or $name =~ m/v72$/
or $name =~ m/z17$/ or $name =~ m/v73$/;
push @new, $name;
}
@topList = @new;
Expand Down
4 changes: 3 additions & 1 deletion src/Applications/GEOSdas_App/fvsetup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,7 @@ sub defaults {
OBS_GridComp.rc.tmpl
saverst.rc
GEOS_SurfaceGridComp.rc
GEOS_IgniGridComp.rc
logging.yaml );

@coupled_files = qw( data_table
Expand Down Expand Up @@ -8959,7 +8960,8 @@ sub write_FVDAS_Run_Config {
$ENV{"MKSICN_SIDB"} = "\$FVHOME/run/gmao_convinfo.db"
}
if ($r21c){
$ENV{"BUFR_MAXOUT"} = "18000"
$ENV{"BUFR_MAXOUT"} = "18000";
$ENV{"CRTM_COEFFS"} = "\$FVHOME/fvInput/gsi/etc/r21c_ncep20221018/Little_Endian";
}
unless ( $ENV{"ARCHIVE"} ) {
Expand Down
4 changes: 3 additions & 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 @@ -26,7 +26,7 @@
$FCHOME, $FCSTAGE, $FERR, $FVDOLMS, $FVGROUP, $FVPLOTS, $FVSCRA,
$FVSILO, $FVSPOOL, $FVSTAGE, $FVWORK, $GRADS_CONFIG, $LIBSZ, $MONTHLY_X);
my ($ACFTBIAS, $NEWRADBC);
my ($BUFR_MAXOUT);
my ($BUFR_MAXOUT, $CRTM_COEFFS);
my (%vv);

# main program
Expand Down Expand Up @@ -100,6 +100,7 @@ sub init {
$MKSICN_SIDB = $ENV{"MKSICN_SIDB"};
$NEWRADBC = $ENV{"NEWRADBC"};
$BUFR_MAXOUT = $ENV{"BUFR_MAXOUT"};
$CRTM_COEFFS = $ENV{"CRTM_COEFFS"};
$MP_SET_NUMTHREADS = $ENV{"MP_SET_NUMTHREADS"};
$NCEPINPUT = $ENV{"NCEPINPUT"};
$OBSCLASS = $ENV{"OBSCLASS"};
Expand Down Expand Up @@ -333,6 +334,7 @@ sub writefile {
print RUNCONF "setenv MKSIOZ_SIDB $MKSIOZ_SIDB\n" if $MKSIOZ_SIDB;
print RUNCONF "setenv MKSICN_SIDB $MKSICN_SIDB\n" if $MKSICN_SIDB;
print RUNCONF "setenv BUFR_MAXOUT $BUFR_MAXOUT\n" if $BUFR_MAXOUT;
print RUNCONF "setenv CRTM_COEFFS $CRTM_COEFFS\n" if $CRTM_COEFFS;
print RUNCONF "setenv MP_SET_NUMTHREADS $MP_SET_NUMTHREADS\n" if $MP_SET_NUMTHREADS;
print RUNCONF "setenv OMP_NUM_THREADS $OMP_NUM_THREADS\n" if $OMP_NUM_THREADS;
print RUNCONF "setenv ARCH_QUEUE \"$ARCH_QUEUE\"\n" if $ARCH_QUEUE;
Expand Down
4 changes: 3 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 @@ -321,7 +321,9 @@ sub means_type {
sub plots_type {
my $name = shift;
return unless means_type($name);
return unless $name =~ m/Cp$/ or $name =~ m/Np$/ or $name =~ m/Nx$/;
# return unless $name =~ m/Cp$/ or $name =~ m/Np$/ or $name =~ m/Nx$/;
return unless $name =~ m/Cp$/ or $name =~ m/Np$/ or $name =~ m/Nx$/
or $name =~ m/p48$/ or $name =~ m/glo_L/;
return 1;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/AGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ USE_RRTMG_IRRAD: 1.0
USE_RRTMG_SORAD: 1.0
ISOLVAR: 2
USE_NRLSSI2: .TRUE.
SOLAR_CYCLE_FILE_NAME: ExtData/g5gcm/solar/NRLSSI2.v2021.txt
SOLAR_CYCLE_FILE_NAME: ExtData/g5gcm/solar/NRLSSI2.v2023.txt

NUM_BANDS: 30

Expand Down
1 change: 1 addition & 0 deletions src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/HISTAENS.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#VERSION: 1
EXPID: >>>EXPID<<<
EXPDSC: ensemble_bkg
Allow_Overwrite: .true.

GRID_LABELS: PC@LHIS_IMx@LHIS_JM-DC
PC@HHIS_IMx@HHIS_JM-DC
Expand Down
1 change: 1 addition & 0 deletions src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/HISTAGEPS.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

EXPID: >>>EXPID<<<
EXPDSC: ensemble_bkg
Allow_Overwrite: .true.

COLLECTIONS: 'prog.eta'
# WxMaps and Meteograms
Expand Down
1 change: 1 addition & 0 deletions src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/HISTAOSE.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

EXPID: >>>EXPID<<<
EXPDSC: ensemble_bkg
Allow_Overwrite: .true.

COLLECTIONS: 'bkg.eta'
@HRESAENS 'Bkg.eta'
Expand Down
2 changes: 1 addition & 1 deletion src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/AtmEnsConfig.csh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,6 @@ setenv PEGCM_QNAME $ATMENS_QNAME


# NOTES:
setenv OBSCLASS1 "r21c_loon_bufr,r21c_gmao_mlst_bufr,r21c_satwnd_bufr,r21c_ncep_tcvitals,r21c_gpsro_bufr,r21c_sevcsr_bufr,r21c_1bamua_bufr,r21c_1bhrs4_bufr,r21c_1bmhs_bufr,r21c_eosairs_bufr,r21c_eosamsua_bufr,r21c_mtiasi_bufr,r21c_atms_bufr,r21c_mls_nc,r21c_aura_omieff_nc,r21c_npp_ompsnmeff_nc,r21c_avcsam_bufr,r21c_avcspm_bufr,r21c_amsr2_bufr,r21c_crisfsr_bufr,r21c_gmi_bufr,r21c_prep_bufr,r21c_acftpfl_bufr"
setenv OBSCLASS1 "r21c_igra2_raob_pre-qc_bufr,r21c_cdas_conv_pre-qc_bufr,r21c_prof_pre-qc_bufr,r21c_avhrrwnd_pre-qc_bufr,r21c_nmodis_pre-qc_bufr,r21c_goes_pre-qc_prep_bufr,r21c_metsat_pre-qc_prep_bufr,r21c_jma_pre-qc_prep_bufr,r21c_ascat_pre-qc_bufr,r21c_repro_ers2_pre-qc_bufr,r21c_qscat_jpl_pre-qc_bufr,r21c_loon_bufr,r21c_gmao_mlst_bufr,r21c_prep_bufr,r21c_acftpfl_bufr,r21c_satwnd_bufr,r21c_avhrr_satwnd_bufr,r21c_ncep_tcvitals,r21c_tmi_bufr,r21c_gpsro_bufr,r21c_sevcsr_bufr,r21c_1bamua_bufr,r21c_1bamub_bufr,r21c_1bhrs2_bufr,r21c_1bhrs3_bufr,r21c_1bhrs4_bufr,r21c_1bmsu_bufr,r21c_1bmhs_bufr,r21c_1bssu_bufr,r21c_eosairs_bufr,r21c_eosamsua_bufr,r21c_mtiasi_bufr,r21c_atms_bufr,r21c_ssmit11_bufr,r21c_ssmit13_bufr,r21c_ssmit14_bufr,r21c_ssmit15_bufr,r21c_amsre_bufr,r21c_osbuv8_bufr,r21c_mls_nc,r21c_npp_ompslp_nc,r21c_aura_omieff_nc,r21c_npp_ompsnmeff_nc,r21c_avcsam_bufr,r21c_avcspm_bufr,r21c_amsr2_bufr,r21c_crisfsr_bufr,r21c_gmi_bufr,r21c_prep_bufr,r21c_acftpfl_bufr"
setenv OBSCLASS "gmao_prep_bufr,gmao_acftpfl_bufr,$OBSCLASS1"

31 changes: 15 additions & 16 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 @@ -33,7 +33,7 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
'lnd_tavg_6hr_glo_L288x181_slv'
'lfo_tavg_6hr_glo_L288x181_slv'
'glc_tavg_6hr_glo_L288x181_slv'
'aer_tavg_6hr_glo_L288x181_slv'
'aer_inst_6hr_glo_L288x181_slv'
'int_inst_6hr_glo_L288x181_slv'
'pbl_inst_6hr_glo_L288x181_z17'
'bkg.eta'
Expand Down Expand Up @@ -405,21 +405,20 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48'
'THV' , 'AGCM' ,
::

aer_tavg_6hr_glo_L288x181_slv.format: 'CFIO' ,
aer_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Analysis,Aerosol Diagnostics' ,
aer_tavg_6hr_glo_L288x181_slv.nbits: 10 ,
aer_tavg_6hr_glo_L288x181_slv.deflate: 2 ,
aer_tavg_6hr_glo_L288x181_slv.regrid_method: 'CONSERVE_MONOTONIC' ,
aer_tavg_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' ,
aer_tavg_6hr_glo_L288x181_slv.mode: 'time-averaged' ,
aer_tavg_6hr_glo_L288x181_slv.grid_label: PC288x181-DC ,
aer_tavg_6hr_glo_L288x181_slv.frequency: 060000 ,
aer_tavg_6hr_glo_L288x181_slv.duration: 060000 ,
aer_tavg_6hr_glo_L288x181_slv.ref_time: 030000 ,
aer_tavg_6hr_glo_L288x181_slv.end_date: >>>IOEDATE<<< ,
aer_tavg_6hr_glo_L288x181_slv.end_time: >>>IOETIME<<< ,
aer_tavg_6hr_glo_L288x181_slv.splitField: 1 ,
aer_tavg_6hr_glo_L288x181_slv.fields: 'TOTEXTTAU' , 'GOCART2G' ,
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.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<<<' ,
aer_inst_6hr_glo_L288x181_slv.mode: 'instantaneous' ,
aer_inst_6hr_glo_L288x181_slv.grid_label: PC288x181-DC ,
aer_inst_6hr_glo_L288x181_slv.frequency: 060000 ,
aer_inst_6hr_glo_L288x181_slv.duration: 060000 ,
aer_inst_6hr_glo_L288x181_slv.end_date: >>>IOEDATE<<< ,
aer_inst_6hr_glo_L288x181_slv.end_time: >>>IOETIME<<< ,
aer_inst_6hr_glo_L288x181_slv.splitField: 1 ,
aer_inst_6hr_glo_L288x181_slv.fields: 'TOTEXTTAU' , 'GOCART2G' ,
'TOTSCATAU' , 'GOCART2G' ,
'TOTANGSTR' , 'GOCART2G' ,
'PM25' , 'GOCART2G' ,
Expand Down
7 changes: 6 additions & 1 deletion src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/setup_atmens.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,12 @@ sub init {
$obsv_nx = 4; $obsv_ny = 8;
$stat_nx = 2; $stat_ny = 2;
} elsif ($nodename eq "cas") {
die "Sorry this node/resolution not set yet, aborting \n";
$enkf_cpus = 368;
$agcm_nx = 6; $agcm_ny = 24;
$miau_nx = 2; $miau_ny = 12;
$obsv_nx = 4; $obsv_ny = 24;
$stat_nx = 2; $stat_ny = 24;
# die "Sorry this node/resolution not set yet, aborting \n";
# $agcm_ncpus_per_node = 46;
} else {
die "Unknown node name, aborting \n";
Expand Down

0 comments on commit 43654a2

Please sign in to comment.