Skip to content

Commit

Permalink
Make sure aveage surface temperature is included
Browse files Browse the repository at this point in the history
  • Loading branch information
ADCollard committed Aug 8, 2024
1 parent 0dcda32 commit 73062e7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 30 deletions.
28 changes: 14 additions & 14 deletions src/gsi/setuprad.f90
Original file line number Diff line number Diff line change
Expand Up @@ -2671,7 +2671,7 @@ subroutine contents_netcdf_diag_(odiags,idv,iob)
call nc_diag_metadata_to_single("Soil_Temperature",surface(1)%soil_temperature ) ! soil temperature (K)
call nc_diag_metadata_to_single("Soil_Moisture",surface(1)%soil_moisture_content ) ! soil moisture
call nc_diag_metadata("Land_Type_Index", surface(1)%land_type ) ! surface land type
call nc_diag_metadata("tsavg5", missing ) ! SST first guess used for SST retrieval
call nc_diag_metadata("tsavg5", tsavg5 ) ! SST first guess used for SST retrieval
call nc_diag_metadata("sstcu", missing ) ! NCEP SST analysis at t
call nc_diag_metadata("sstph", missing ) ! Physical SST retrieval
call nc_diag_metadata("sstnv", missing ) ! Navy SST retrieval
Expand Down Expand Up @@ -2922,22 +2922,22 @@ subroutine contents_netcdf_diag_(odiags,idv,iob)
call nc_diag_metadata_to_single("tropopause_pressure", trop5*r1000) ! trop5 is in kPa - convert to Pa for JEDI

! Get GeoVaLs for atmosphere
!call nc_diag_data2d("air_temperature", atmosphere(1)%temperature) ! K
!call nc_diag_data2d("air_pressure", atmosphere(1)%pressure*r100)
!call nc_diag_data2d("air_pressure_levels", atmosphere(1)%level_pressure*r100)
call nc_diag_data2d("air_temperature", atmosphere(1)%temperature) ! K
call nc_diag_data2d("air_pressure", atmosphere(1)%pressure*r100)
call nc_diag_data2d("air_pressure_levels", atmosphere(1)%level_pressure*r100)

! Get GeoVaLs for atmospheric absorbers
!do iabsorb = 1, n_absorbers
! write (fieldname, "(A,I0.2)") "atmosphere_absorber_", atmosphere(1)%absorber_id(iabsorb)
! call nc_diag_data2d(trim(fieldname), atmosphere(1)%absorber(:,iabsorb)) ! check %absorber_units
!enddo
do iabsorb = 1, n_absorbers
write (fieldname, "(A,I0.2)") "atmosphere_absorber_", atmosphere(1)%absorber_id(iabsorb)
call nc_diag_data2d(trim(fieldname), atmosphere(1)%absorber(:,iabsorb)) ! check %absorber_units
enddo
! Get GeoVaLs for hydrometeors
!do icloud = 1, n_clouds_fwd_wk
! write (fieldname, "(A,I0.2)") "atmosphere_mass_content_of_cloud_", atmosphere(1)%Cloud(icloud)%Type
! call nc_diag_data2d(trim(fieldname), atmosphere(1)%Cloud(icloud)%Water_Content)
! write (fieldname, "(A,I0.2)") "effective_radius_of_cloud_particle_", atmosphere(1)%Cloud(icloud)%Type
! call nc_diag_data2d(trim(fieldname), atmosphere(1)%Cloud(icloud)%Effective_Radius)
!enddo
do icloud = 1, n_clouds_fwd_wk
write (fieldname, "(A,I0.2)") "atmosphere_mass_content_of_cloud_", atmosphere(1)%Cloud(icloud)%Type
call nc_diag_data2d(trim(fieldname), atmosphere(1)%Cloud(icloud)%Water_Content)
write (fieldname, "(A,I0.2)") "effective_radius_of_cloud_particle_", atmosphere(1)%Cloud(icloud)%Type
call nc_diag_data2d(trim(fieldname), atmosphere(1)%Cloud(icloud)%Effective_Radius)
enddo
enddo
! if (adp_anglebc) then
if (.true.) then
Expand Down
21 changes: 6 additions & 15 deletions ush/run_observer/gsi_observer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ aeroinfo=$fixgsi/global_aeroinfo.txt
atmsbeaminfo=$fixgsi/atms_beamwidth.txt
cloudyinfo=$fixgsi/cloudy_radiance_info.txt

CRTM_FIX=/apps/contrib/NCEP/libs/hpc-stack-gfsv16/intel-2018.4/crtm/2.3.0/fix/

emiscoef_IRwater=$CRTM_FIX/Nalli.IRwater.EmisCoeff.bin
emiscoef_IRice=$CRTM_FIX/NPOESS.IRice.EmisCoeff.bin
emiscoef_IRland=$CRTM_FIX/NPOESS.IRland.EmisCoeff.bin
Expand Down Expand Up @@ -372,20 +370,20 @@ OBS_INPUT::
# tcvitl tcp null tcp 0.0 0 0
# seviribufr seviri m08 seviri_m08 0.0 1 0
# seviribufr seviri m09 seviri_m09 0.0 1 0
# seviribufr seviri m10 seviri_m10 0.0 1 0
# seviribufr seviri m11 seviri_m11 0.0 1 0
seviribufr seviri m10 seviri_m10 0.0 1 0
seviribufr seviri m11 seviri_m11 0.0 1 0
# hirs4bufr hirs4 metop-b hirs4_metop-b 0.0 1 0
amsuabufr amsua metop-b amsua_metop-b 0.0 1 0
mhsbufr mhs metop-b mhs_metop-b 0.0 1 0
iasibufr iasi metop-b iasi_metop-b 0.0 1 0
# gomebufr gome metop-b gome_metop-b 0.0 2 0
atmsbufr atms npp atms_npp 0.0 1 0
atmsbufr atms n20 atms_n20 0.0 1 0
# atmsbufr atms n21 atms_n21 0.0 1 0
atmsbufr atms n21 atms_n21 0.0 1 0
# crisbufr cris npp cris_npp 0.0 1 0
# crisfsbufr cris-fsr npp cris-fsr_npp 0.0 1 0
crisfsbufr cris-fsr n20 cris-fsr_n20 0.0 1 0
# crisfsbufr cris-fsr n21 cris-fsr_n21 0.0 1 0
crisfsbufr cris-fsr n21 cris-fsr_n21 0.0 1 0
# gsnd1bufr sndrd1 g14 sndrD1_g14 0.0 1 0
# gsnd1bufr sndrd2 g14 sndrD2_g14 0.0 1 0
# gsnd1bufr sndrd3 g14 sndrD3_g14 0.0 1 0
Expand All @@ -406,6 +404,7 @@ OBS_INPUT::
ahibufr ahi himawari8 ahi_himawari8 0.0 1 0
abibufr abi g16 abi_g16 0.0 1 0
abibufr abi g17 abi_g17 0.0 1 0
abibufr abi g18 abi_g18 0.0 1 0
# rapidscatbufr uv null uv 0.0 0 0
ompsnpbufr ompsnp npp ompsnp_npp 0.0 0 0
ompstcbufr ompstc8 npp ompstc8_npp 0.0 2 0
Expand Down Expand Up @@ -464,15 +463,7 @@ diagtype[0]="conv conv_gps conv_ps conv_q conv_sst conv_t conv_uv"
diagtype[1]="pcp_ssmi_dmsp pcp_tmi_trmm"
diagtype[2]="sbuv2_n16 sbuv2_n17 sbuv2_n18 sbuv2_n19 gome_metop-a gome_metop-b omi_aura mls30_aura ompsnp_npp
ompstc8_npp"
diagtype[3]="hirs2_n14 msu_n14 sndr_g08 sndr_g11 sndr_g12 sndr_g13 sndr_g08_prep sndr_g11_prep sndr_g12_prep
sndr_g13_prep sndrd1_g11 sndrd2_g11 sndrd3_g11 sndrd4_g11 sndrd1_g12 sndrd2_g12 sndrd3_g12 sndrd4_g12 sndrd1_g13
sndrd2_g13 sndrd3_g13 sndrd4_g13 sndrd1_g14 sndrd2_g14 sndrd3_g14 sndrd4_g14 sndrd1_g15 sndrd2_g15 sndrd3_g15 sndrd4_g15
hirs3_n15 hirs3_n16 hirs3_n17 amsua_n15 amsua_n16 amsua_n17 amsub_n15 amsub_n16 amsub_n17 hsb_aqua airs_aqua amsua_aqua
imgr_g08 imgr_g11 imgr_g12 imgr_g14 imgr_g15 ssmi_f13 ssmi_f15 hirs4_n18 hirs4_metop-a amsua_n18 amsua_metop-a mhs_n18
mhs_metop-a amsre_low_aqua amsre_mid_aqua amsre_hig_aqua ssmis_f16 ssmis_f17 ssmis_f18 ssmis_f19 ssmis_f20 iasi_metop-a
hirs4_n19 amsua_n19 mhs_n19 seviri_m08 seviri_m09 seviri_m10 seviri_m11 cris_npp cris-fsr_npp cris-fsr_n20 atms_npp
atms_n20 hirs4_metop-b amsua_metop-b mhs_metop-b iasi_metop-b amsua_metop-c mhs_metop-c avhrr_n18 avhrr_n19 avhrr_metop-a avhrr_metop-b avhrr_metop-c amsr2_gcom-w1 gmi_gpm
saphir_meghat ahi_himawari8"
diagtype[3]="msu_n14 sndr_g08 sndr_g11 sndr_g12 sndr_g13 sndr_g08_prep sndr_g11_prep sndr_g12_prep sndr_g13_prep sndrd1_g11 sndrd2_g11 sndrd3_g11 sndrd4_g11 sndrd1_g12 sndrd2_g12 sndrd3_g12 sndrd4_g12 sndrd1_g13 sndrd2_g13 sndrd3_g13 sndrd4_g13 sndrd1_g14 sndrd2_g14 sndrd3_g14 sndrd4_g14 sndrd1_g15 sndrd2_g15 sndrd3_g15 sndrd4_g15 amsua_n15 amsua_n16 amsua_n17 amsub_n15 amsub_n16 amsub_n17 hsb_aqua airs_aqua amsua_aqua imgr_g08 imgr_g11 imgr_g12 imgr_g14 imgr_g15 ssmi_f13 ssmi_f15 amsua_n18 amsua_metop-a mhs_n18 mhs_metop-a amsre_low_aqua amsre_mid_aqua amsre_hig_aqua ssmis_f16 ssmis_f17 ssmis_f18 ssmis_f19 ssmis_f20 iasi_metop-a amsua_n19 mhs_n19 seviri_m08 seviri_m09 seviri_m10 seviri_m11 cris_npp cris-fsr_npp cris-fsr_n20 atms_npp atms_n20 amsua_metop-b mhs_metop-b iasi_metop-b avhrr_metop-b avhrr_n18 avhrr_n19 avhrr_metop-a amsr2_gcom-w1 gmi_gpm saphir_meghat ahi_himawari8 abi_g16 abi_g17 amsua_metop-c mhs_metop-c iasi_metop-c avhrr_metop-c viirs-m_npp viirs-m_j1 abi_g18 ahi_himawari9 viirs-m_j2 cris-fsr_n21 atms_n21"

prefix=" dir.*/"
loops="01"
Expand Down
2 changes: 1 addition & 1 deletion ush/run_observer/submit_gsi_observer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ rstprod="true"
nhr_bkg=6

# should NOT touch below this line
CRTM_FIX=/apps/contrib/NCEP/libs/hpc-stack-gfsv16/intel-2018.4/crtm/2.3.0/fix/
CRTM_FIX=/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/intel/2021.9.0/crtm-fix-2.4.0.1_emc-2os2hw2/fix
# many people cannot clone this without gerrit permissions
# plus, I have the C768 berror file here
# so that GSI observer can run at full background res
Expand Down

0 comments on commit 73062e7

Please sign in to comment.