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

Jump to bottom

Minor additional changes to make up 5.41.x #175

Merged
merged 13 commits into from
Oct 2, 2024
Merged

Minor additional changes to make up 5.41.x #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
434dd36
uninit variable caused crash on sles15
rtodling Sep 28, 2024
e058ceb
seem to be needed for consistency w/ latest m21c
rtodling Sep 28, 2024
4426cfd
missed in original merge toward 541
rtodling Sep 28, 2024
f5cb935
more to create 541
rtodling Sep 28, 2024
8e2cc0e
naming reset
rtodling Sep 28, 2024
8d52b90
latest R21C
rtodling Sep 28, 2024
6620965
bypass cris-fsr-n21 until crtm coeffs straightened up; coordinate w/ …
rtodling Sep 28, 2024
bcb1ff7
for consistency w/ m21c
rtodling Sep 28, 2024
69656b5
consistent w/ m21c
rtodling Sep 28, 2024
8f0370a
consistent w/ m21c
rtodling Sep 28, 2024
49ee2f9
still does not work for AMSUA-metop-c when ta2tb=true
rtodling Sep 30, 2024
fea2418
this now works for Ta2Tb=true; but I can tell there has been confusio…
rtodling Sep 30, 2024
f180b13
comment about main change
rtodling Sep 30, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- add CrIS-FSR N21
- revert obs errors for CrIS-Npp and N20 to what they
were in x0049.
- add fix to read_bufrtovs to handle ta2tb=.true. when
there are multiple versions of SpcCoeff.bin file for
single instrument/platform

### Fixed

Expand Down
2 changes: 2 additions & 0 deletions GEOSaana_GridComp/GEOSgsi_Coupler/cplr_ensemble.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ subroutine get_geos_ens(this,grd,member,ntindex,tau,atm_bundle,iret)

! Read in a single ensemble member
if(l4densvar) then
ida(:)=0
ida(1:3)=ibdate(1:3)
ida(5:6)=ibdate(4:5)
jda(:)=0
Expand Down Expand Up @@ -322,6 +323,7 @@ subroutine get_geos_Nens(this,grd,members,ntindex,tau,atm_bundle,iret)

! Read in ensemble members
if(l4densvar) then
ida(:) = 0
ida(1:3)=ibdate(1:3)
ida(5:6)=ibdate(4:5)
jda(:)=0
Expand Down
2 changes: 1 addition & 1 deletion GEOSaana_GridComp/GSI_GridComp/bkgvar_rewgt.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ subroutine bkgvar_rewgt(sfvar,vpvar,tvar,psvar,mype)
nsmth=8
call smooth2d(sfvar,vpvar,tvar,psvar,nsig,nsmth,mype)

if (bkgv_write) call write_bkgvars_grid(sfvar,vpvar,tvar,psvar,'bkgvar',mype)
if (bkgv_write) call write_bkgvars_grid(sfvar,vpvar,tvar,psvar,'bkgvar_rewgt',mype)
if(mype==0) write(6,*) 'bkgvar_rewgt: Flow-dependent feature on: nt=',nfldsig, ' minus nt= 1'

return
Expand Down
4 changes: 4 additions & 0 deletions GEOSaana_GridComp/GSI_GridComp/etc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,14 @@ install(
# Handle GEOS-R21C settings in a similar way as MERRA2
set (R21C_files
R21C/gmao_global_cloudy_radiance_info.rc
R21C/gmao_global_convinfo.rc
R21C/gmao_global_satinfo.rc
R21C/gmao_global_scaninfo.rc
R21C/gmao_global_tlapmean.rc
R21C/gmao_global_ozinfo.rc
R21C/gsi.rc.tmpl
R21C/gsi_sens.rc.tmpl
R21C/prepobs_errtable.global
)
install(
FILES ${R21C_files}
Expand Down
289 changes: 289 additions & 0 deletions GEOSaana_GridComp/GSI_GridComp/etc/R21C/gmao_global_convinfo.rc
View file
Open in desktop

Large diffs are not rendered by default.

661 changes: 661 additions & 0 deletions GEOSaana_GridComp/GSI_GridComp/etc/R21C/gmao_global_ozinfo.rc
View file
Open in desktop

Large diffs are not rendered by default.

56 changes: 35 additions & 21 deletions GEOSaana_GridComp/GSI_GridComp/etc/R21C/gmao_global_satinfo.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,27 +1138,41 @@
avhrr3_n18 3 -1 0.600 0.000 3.000 10.000 0.000 1 -1 -1
avhrr3_n18 4 -1 0.680 0.000 3.000 10.000 0.000 1 -1 -1
avhrr3_n18 5 -1 0.720 0.000 3.000 10.000 0.000 1 -1 -1
ssmi_f13 1 -1 1.600 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f13 2 -1 2.260 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f13 3 -1 2.010 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f13 4 -1 1.480 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f13 5 -1 2.280 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f13 6 -1 1.430 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f13 7 -1 2.330 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f14 1 -1 1.600 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f14 2 -1 2.260 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f14 3 -1 2.010 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f14 4 -1 1.480 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f14 5 -1 2.280 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f14 6 -1 1.430 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f14 7 -1 2.330 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f15 1 -1 1.600 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f15 2 -1 2.260 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f15 3 -1 2.010 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f15 4 -1 1.480 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f15 5 -1 2.280 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f15 6 -1 1.430 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f15 7 -1 2.330 0.000 6.000 10.000 0.000 1 -1 -1
ssmi_f10 1 -2 3.000 10.000 8.000 10.000 0.000 1 1 -1
ssmi_f10 2 -2 6.000 20.000 15.000 10.000 0.000 1 1 -1
ssmi_f10 3 -2 4.000 15.000 20.000 10.000 0.000 1 1 -1
ssmi_f10 4 -2 5.000 20.000 30.000 10.000 0.000 1 1 -1
ssmi_f10 5 -2 8.000 25.000 40.000 10.000 0.000 1 1 -1
ssmi_f10 6 -2 5.000 15.000 15.000 10.000 0.000 1 1 -1
ssmi_f10 7 -2 10.000 40.000 40.000 10.000 0.000 1 1 -1
ssmi_f11 1 -2 3.000 10.000 8.000 10.000 0.000 1 1 -1
ssmi_f11 2 -2 6.000 20.000 15.000 10.000 0.000 1 1 -1
ssmi_f11 3 -2 4.000 15.000 20.000 10.000 0.000 1 1 -1
ssmi_f11 4 -2 5.000 20.000 30.000 10.000 0.000 1 1 -1
ssmi_f11 5 -2 8.000 25.000 40.000 10.000 0.000 1 1 -1
ssmi_f11 6 -2 5.000 15.000 15.000 10.000 0.000 1 1 -1
ssmi_f11 7 -2 10.000 40.000 40.000 10.000 0.000 1 1 -1
ssmi_f13 1 -2 3.000 10.000 8.000 10.000 0.000 1 1 -1
ssmi_f13 2 -2 6.000 20.000 15.000 10.000 0.000 1 1 -1
ssmi_f13 3 -2 4.000 15.000 20.000 10.000 0.000 1 1 -1
ssmi_f13 4 -2 5.000 20.000 30.000 10.000 0.000 1 1 -1
ssmi_f13 5 -2 8.000 25.000 40.000 10.000 0.000 1 1 -1
ssmi_f13 6 -2 5.000 15.000 15.000 10.000 0.000 1 1 -1
ssmi_f13 7 -2 10.000 40.000 40.000 10.000 0.000 1 1 -1
ssmi_f14 1 -2 3.000 10.000 8.000 10.000 0.000 1 1 -1
ssmi_f14 2 -2 6.000 20.000 15.000 10.000 0.000 1 1 -1
ssmi_f14 3 -2 4.000 15.000 20.000 10.000 0.000 1 1 -1
ssmi_f14 4 -2 5.000 20.000 30.000 10.000 0.000 1 1 -1
ssmi_f14 5 -2 8.000 25.000 40.000 10.000 0.000 1 1 -1
ssmi_f14 6 -2 5.000 15.000 15.000 10.000 0.000 1 1 -1
ssmi_f14 7 -2 10.000 40.000 40.000 10.000 0.000 1 1 -1
ssmi_f15 1 -2 3.000 10.000 8.000 10.000 0.000 1 1 -1
ssmi_f15 2 -2 6.000 20.000 15.000 10.000 0.000 1 1 -1
ssmi_f15 3 -2 4.000 15.000 20.000 10.000 0.000 1 1 -1
ssmi_f15 4 -2 5.000 20.000 30.000 10.000 0.000 1 1 -1
ssmi_f15 5 -2 8.000 25.000 40.000 10.000 0.000 1 1 -1
ssmi_f15 6 -2 5.000 15.000 15.000 10.000 0.000 1 1 -1
ssmi_f15 7 -2 10.000 40.000 40.000 10.000 0.000 1 1 -1
ssmis_f16 1 -1 1.500 0.000 6.000 10.000 0.000 1 -1 -1
ssmis_f16 2 -1 0.500 0.000 6.000 10.000 0.000 1 -1 -1
ssmis_f16 3 -1 0.500 0.000 6.000 10.000 0.000 1 -1 -1
Expand Down
61 changes: 61 additions & 0 deletions GEOSaana_GridComp/GSI_GridComp/etc/R21C/gmao_global_scaninfo.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
hirs2_n11 -49.500 1.800 56 7 50
hirs2_n12 -49.500 1.800 56 7 50
hirs2_n14 -49.500 1.800 56 7 50
hirs3_n15 -49.500 1.800 56 7 50
hirs3_n16 -49.500 1.800 56 7 50
hirs3_n17 -49.500 1.800 56 7 50
hirs4_n18 -49.500 1.800 56 7 50
hirs4_n19 -49.500 1.800 56 7 50
amsua_n15 -48.333 3.333 30 4 27
amsua_n16 -48.333 3.333 30 4 27
amsua_n17 -48.333 3.333 30 4 27
amsua_n18 -48.333 3.333 30 4 27
amsua_n19 -48.333 3.333 30 4 27
amsub_n15 -48.950 1.100 90 10 81
amsub_n16 -48.950 1.100 90 10 81
amsub_n17 -48.950 1.100 90 10 81
atms_npp -52.725 1.110 96 7 90
atms_n20 -52.725 1.110 96 7 90
atms_n21 -52.725 1.110 96 7 90
mhs_n18 -49.444 1.111 90 10 81
mhs_n19 -49.444 1.111 90 10 81
airs_aqua -48.900 1.100 90 10 81
amsua_aqua -48.333 3.333 30 4 27
hirs4_metop-a -49.500 1.800 56 7 50
amsua_metop-a -48.333 3.333 30 4 27
mhs_metop-a -49.444 1.111 90 10 81
iasi_metop-a -48.330 3.334 60 5 56
hirs4_metop-b -49.500 1.800 56 7 50
amsua_metop-b -48.333 3.333 30 4 27
mhs_metop-b -49.444 1.111 90 10 81
iasi_metop-b -48.330 3.334 60 5 56
amsua_metop-c -48.333 3.333 30 4 27
mhs_metop-c -49.444 1.111 90 10 81
iasi_metop-c -48.330 3.334 60 5 56
msu_n11 -47.370 9.474 11 2 10
msu_n12 -47.370 9.474 11 2 10
msu_n14 -47.370 9.474 11 2 10
ssu_n11 -35.000 10.000 8 2 7
ssu_n14 -35.000 10.000 8 2 7
hsb -48.950 1.100 90 10 81
seviri_m09 0.000 1.000 90 -1 -1
seviri_m10 0.000 1.000 90 -1 -1
seviri_m11 0.000 1.000 90 -1 -1
cris_npp -48.330 3.3331 30 1 30
cris-fsr_npp -48.330 3.3331 30 1 30
cris-fsr_n20 -48.330 3.3331 30 1 30
ssmis_f16 0.000 1.000 60 1 60
ssmis_f17 0.000 1.000 60 1 60
ssmis_f18 0.000 1.000 60 1 60
tmi_trmm 0.000 1.000 70 5 66
gmi_gpm 0.000 1.000 74 5 70
avhrr3_n15 -52.612 1.182 90 1 90
avhrr3_n16 -52.612 1.182 90 1 90
avhrr3_n17 -52.612 1.182 90 1 90
avhrr3_n18 -52.612 1.182 90 1 90
avhrr3_metop-a -52.612 1.182 90 1 90
avhrr3_n19 -52.612 1.182 90 1 90
avhrr3_metop-b -52.612 1.182 90 1 90
amsre_aqua 0.000 1.000 81 9 73
amsr2_gcom-w1 0.000 1.000 81 1 81
!sat_sis start step nstep edge1 edge2
25 changes: 25 additions & 0 deletions GEOSaana_GridComp/GSI_GridComp/etc/R21C/gmao_global_tlapmean.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3051,6 +3051,9 @@
avhrr3_n18 3 0.884430E-02
avhrr3_n18 4 0.115395E-01
avhrr3_n18 5 0.161449E-01
avhrr3_n19 3 0.884430E-02
avhrr3_n19 4 0.115395E-01
avhrr3_n19 5 0.161449E-01
avhrr3_metop-b 3 0.870211E-02
avhrr3_metop-b 4 0.101765E-01
avhrr3_metop-b 5 0.136881E-01
Expand Down Expand Up @@ -4604,3 +4607,25 @@
iasi_metop-c 8015 0.252782E-02
iasi_metop-c 8055 0.211941E-02
iasi_metop-c 8078 0.255765E-02
atms_n21 1 0.512737E-02
atms_n21 2 0.303659E-02
atms_n21 3 0.195258E-01
atms_n21 4 0.288066E-01
atms_n21 5 0.441836E-01
atms_n21 6 0.595033E-01
atms_n21 7 0.734547E-01
atms_n21 8 0.553927E-01
atms_n21 9 0.384262E-01
atms_n21 10 -0.877870E-02
atms_n21 11 -0.271310E-01
atms_n21 12 -0.378828E-01
atms_n21 13 -0.500887E-01
atms_n21 14 -0.597374E-01
atms_n21 15 -0.425791E-01
atms_n21 16 0.901768E-02
atms_n21 17 0.226993E-01
atms_n21 18 0.374439E-01
atms_n21 19 0.506295E-01
atms_n21 20 0.638392E-01
atms_n21 21 0.811072E-01
atms_n21 22 0.958808E-01
14 changes: 10 additions & 4 deletions GEOSaana_GridComp/GSI_GridComp/etc/R21C/gsi.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
ifact10=0,
pseudo_q2=.true.,
use_prepb_satwnd=>>>USE_PREPB_SATWND<<<,
ta2tb=.true.,
ec_amv_qc=.false.,
diag_version=30303,
iguess=-1,
Expand All @@ -27,7 +28,7 @@
@4DHYB l4densvar=.true.,nmn_obsbin=@VAROBSBIN,iwrtinc=@IWRTINC,thin4d=.true.,
iorthomax=10,
ens_nstarthr=3,
netcdf_diag=.false.,
netcdf_diag=.false.,wrtgeovals=.false.,
@RADBC newpc4pred=.true.,adp_anglebc=.true.,angord=4,
@RADBC passive_bc=.true.,use_edges=.false.,
@RADBC diag_precon=.true.,step_start=1.e-3,emiss_bc=.true.,
Expand Down Expand Up @@ -82,7 +83,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 All @@ -93,9 +94,12 @@ OBS_INPUT::
sbuvbufr sbuv2 n18 sbuv8_n18 0.0 0 0 r21c_osbuv8_bufr
sbuvbufr sbuv2 n19 sbuv8_n19 0.0 0 0 r21c_osbuv8_bufr
ompsnmeffnc ompsnmeff npp ompsnmeff_npp 0.0 2 0 r21c_npp_ompsnmeff_nc
ompsnmeffnc ompsnmeff n20 ompsnmeff_n20 0.0 2 0 r21c_n20_ompsnmeff_nc
ompsnmeffnc ompsnmeff n21 ompsnmeff_n21 0.0 2 0 r21c_n21_ompsnmeff_nc
! ompsnpnc ompsnpnc npp ompsnpnc_npp 0.0 0 0 r21c_npp_ompsnp_nc
! ompslpgnc ompslpnc npp ompslpnc_npp 1.0 0 0 r21c_ompslpnc_nc
ompslpvisnc ompslpvis npp ompslpvis_npp 0.0 0 0 r21c_ompslpvis_nc
ompslpnc ompslpnc npp ompslpnc_npp 0.0 0 0 r21c_npp_ompslp_nc
ompslpnc ompslpnc n21 ompslpnc_n21 0.0 0 0 r21c_n21_ompslp_nc
! ompslpvisnc ompslpvis npp ompslpvis_npp 0.0 0 0 r21c_ompslpvis_nc
mlsnc mls55 aura mls55_aura 0.0 0 0 r21c_mls_nc
omieffnc omieff aura omieff_aura 0.0 2 0 r21c_aura_omieff_nc
hirs2bufr hirs2 n11 hirs2_n11 0.0 1 0 r21c_1bhrs2_bufr
Expand All @@ -113,6 +117,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 Expand Up @@ -142,6 +147,7 @@ OBS_INPUT::
iasibufr iasi metop-c iasi_metop-c 0.0 3 0 r21c_mtiasi_bufr
atmsbufr atms npp atms_npp 0.0 1 0 r21c_atms_bufr
atmsbufr atms n20 atms_n20 0.0 1 0 r21c_atms_bufr
atmsbufr atms n21 atms_n21 0.0 1 0 r21c_atms_bufr
crisfsrbufr cris-fsr npp cris-fsr_npp 0.0 3 0 r21c_crisfsr_bufr
crisfsrbufr cris-fsr n20 cris-fsr_n20 0.0 3 0 r21c_crisfsr_bufr
tmibufr tmi trmm tmi_trmm 0.0 1 0 r21c_tmi_bufr
Expand Down
Loading
Loading