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

Release/gfsda.v16.3.0 #456

Merged
merged 10 commits into from
Aug 28, 2022
Merged

Release/gfsda.v16.3.0 #456

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
71495be
Add additional directories and files to prune_4nco_global.sh (#137)
RussTreadon-NOAA Aug 22, 2022
053e447
Updates in response to errors identified by `-check all` (#137)
RussTreadon-NOAA Aug 22, 2022
a1dfd2c
add string FATAL to error messages flagging input file errors (#137)
RussTreadon-NOAA Aug 22, 2022
0b5ea6d
Update prune_4nco.sh to remove the entire Conventional_Monitor direct…
RussTreadon-NOAA Aug 23, 2022
c6c33da
Remove hardwired definition for NDATE in lieu of prod_util definition…
RussTreadon-NOAA Aug 23, 2022
3b9c14a
Remove NEMSIOGET definition from ex scripts; remove NDATE definition …
RussTreadon-NOAA Aug 23, 2022
51edc24
Remove para section for crtm/2.4.0 in gsi_wcoss2.lua; comment out Con…
RussTreadon-NOAA Aug 23, 2022
82b38a4
Merge remote-tracking branch 'upstream/release/gfsda.v16.3.0' into re…
RussTreadon-NOAA Aug 25, 2022
955dae3
Remove Mitigation_flag_AMVQ (#137)
RussTreadon-NOAA Aug 26, 2022
36481a2
Check file or directory existence before attempting to prune (#137)
RussTreadon-NOAA Aug 26, 2022
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
6 changes: 0 additions & 6 deletions modulefiles/gsi_wcoss2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,5 @@ load(pathJoin("python", python_ver))
load(pathJoin("prod_util", prod_util_ver))

load("gsi_common")
unload("crtm")

pushenv("HPC_OPT", "/apps/ops/para/libs")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7/")
load("crtm/2.4.0")
RussTreadon-NOAA marked this conversation as resolved.
Show resolved Hide resolved

whatis("Description: GSI environment on WCOSS2")
1 change: 0 additions & 1 deletion scripts/exgdas_enkf_ecen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ ntiles=${ntiles:-6}
# Utilities
NCP=${NCP:-"/bin/cp -p"}
NLN=${NLN:-"/bin/ln -sf"}
NEMSIOGET=${NEMSIOGET:-${NWPROD}/exec/nemsio_get}
NCLEN=${NCLEN:-$HOMEgfs/ush/getncdimlen}

# Scripts
Expand Down
1 change: 0 additions & 1 deletion scripts/exgdas_enkf_sfc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ ntiles=${ntiles:-6}
# Utilities
NCP=${NCP:-"/bin/cp -p"}
NLN=${NLN:-"/bin/ln -sf"}
NEMSIOGET=${NEMSIOGET:-${NWPROD}/exec/nemsio_get}
NCLEN=${NCLEN:-$HOMEgfs/ush/getncdimlen}

# Scripts
Expand Down
1 change: 0 additions & 1 deletion scripts/exgdas_enkf_update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ pwd=$(pwd)
# Utilities
NCP=${NCP:-"/bin/cp -p"}
NLN=${NLN:-"/bin/ln -sf"}
NEMSIOGET=${NEMSIOGET:-$NWPROD/utils/exec/nemsio_get}
NCLEN=${NCLEN:-$HOMEgfs/ush/getncdimlen}
USE_CFP=${USE_CFP:-"NO"}
CFP_MP=${CFP_MP:-"NO"}
Expand Down
1 change: 0 additions & 1 deletion scripts/exglobal_atmos_analysis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export NCP=${NCP:-"/bin/cp"}
export NMV=${NMV:-"/bin/mv"}
export NLN=${NLN:-"/bin/ln -sf"}
export CHGRP_CMD=${CHGRP_CMD:-"chgrp ${group_name:-rstprod}"}
export NEMSIOGET=${NEMSIOGET:-${NWPROD}/exec/nemsio_get}
export NCLEN=${NCLEN:-$HOMEgfs/ush/getncdimlen}
COMPRESS=${COMPRESS:-gzip}
UNCOMPRESS=${UNCOMPRESS:-gunzip}
Expand Down
1 change: 0 additions & 1 deletion scripts/exglobal_atmos_analysis_calc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export NCP=${NCP:-"/bin/cp"}
export NMV=${NMV:-"/bin/mv"}
export NLN=${NLN:-"/bin/ln -sf"}
export CHGRP_CMD=${CHGRP_CMD:-"chgrp ${group_name:-rstprod}"}
export NEMSIOGET=${NEMSIOGET:-${NWPROD}/exec/nemsio_get}
export NCLEN=${NCLEN:-$HOMEgfs/ush/getncdimlen}
COMPRESS=${COMPRESS:-gzip}
UNCOMPRESS=${UNCOMPRESS:-gunzip}
Expand Down
1 change: 0 additions & 1 deletion scripts/exglobal_diag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export NCP=${NCP:-"/bin/cp"}
export NMV=${NMV:-"/bin/mv"}
export NLN=${NLN:-"/bin/ln -sf"}
export CHGRP_CMD=${CHGRP_CMD:-"chgrp ${group_name:-rstprod}"}
export NEMSIOGET=${NEMSIOGET:-${NWPROD}/exec/nemsio_get}
export NCLEN=${NCLEN:-$HOMEgfs/ush/getncdimlen}
export CATEXEC=${CATEXEC:-$HOMEgfs/exec/ncdiag_cat_serial.x}
COMPRESS=${COMPRESS:-gzip}
Expand Down
28 changes: 14 additions & 14 deletions src/gsi/cplr_gfs_ensmod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ subroutine move2bundle_(grd3d,en_loc3,atm_bundle,m_cvars2d,m_cvars3d,iret)
character(len=70) :: filename

integer(i_kind) :: ierr
integer(i_kind) :: km,m
integer(i_kind) :: km1,m
integer(i_kind) :: icw,iql,iqi,iqr,iqs,iqg
real(r_kind),pointer,dimension(:,:) :: ps
!real(r_kind),pointer,dimension(:,:) :: sst
Expand Down Expand Up @@ -440,31 +440,31 @@ subroutine move2bundle_(grd3d,en_loc3,atm_bundle,m_cvars2d,m_cvars3d,iret)
! if(trim(cvars2d(m))=='sst') sst=en_loc3(:,:,m_cvars2d(m)) !no sst for now
enddo

km = en_perts(1,1)%grid%km
km1 = en_perts(1,1)%grid%km - 1
!$omp parallel do schedule(dynamic,1) private(m)
do m=1,nc3d
if(trim(cvars3d(m))=='sf')then
u = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
u = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
else if(trim(cvars3d(m))=='vp') then
v = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
v = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
else if(trim(cvars3d(m))=='t') then
tv = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
tv = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
else if(trim(cvars3d(m))=='q') then
q = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
q = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
else if(trim(cvars3d(m))=='oz') then
oz = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
oz = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
else if(trim(cvars3d(m))=='cw') then
cwmr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
cwmr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
else if(trim(cvars3d(m))=='ql') then
qlmr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
qlmr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
else if(trim(cvars3d(m))=='qi') then
qimr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
qimr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
else if(trim(cvars3d(m))=='qr') then
qrmr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
qrmr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
else if(trim(cvars3d(m))=='qs') then
qsmr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
qsmr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
else if(trim(cvars3d(m))=='qg') then
qgmr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km)
qgmr = en_loc3(:,:,m_cvars3d(m):m_cvars3d(m)+km1)
RussTreadon-NOAA marked this conversation as resolved.
Show resolved Hide resolved
end if
enddo

Expand Down Expand Up @@ -930,7 +930,7 @@ subroutine parallel_read_gfsnc_state_(en_full,m_cvars2d,m_cvars3d,nlon,nlat,nsig

atmges = open_dataset(filename,errcode=ierror)
if (ierror /=0) then
write(6,*)' PARALLEL_READ_GFSNC_STATE: ***ERROR*** ',trim(filename),' NOT AVAILABLE: PROGRAM STOPS'
write(6,*)' PARALLEL_READ_GFSNC_STATE: ***FATAL ERROR*** ',trim(filename),' NOT AVAILABLE: PROGRAM STOPS'
call stop2(999)
endif
! get dimension sizes
Expand Down
1 change: 1 addition & 0 deletions src/gsi/general_read_gfsatm.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2825,6 +2825,7 @@ subroutine general_read_gfsatm_allhydro_nc(grd,sp_a,filename,uvflag,vordivflag,z
call gsi_bundlegetpointer(gfs_bundle,'q' ,g_q ,ier);istatus=istatus+ier
call gsi_bundlegetpointer(gfs_bundle,'oz',g_oz ,ier);istatus=istatus+ier
! call gsi_bundlegetpointer(gfs_bundle,'cw',g_cwmr,ier);istatus=istatus+ier
istatus1=0
RussTreadon-NOAA marked this conversation as resolved.
Show resolved Hide resolved
call gsi_bundlegetpointer(gfs_bundle,'ql',g_ql ,ier);istatus1=istatus1+ier
call gsi_bundlegetpointer(gfs_bundle,'qi',g_qi ,ier);istatus1=istatus1+ier
call gsi_bundlegetpointer(gfs_bundle,'qr',g_qr ,ier);istatus1=istatus1+ier
Expand Down
10 changes: 5 additions & 5 deletions src/gsi/gesinfo.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ subroutine gesinfo
write(filename,'("sigf",i2.2)')nhr_assimilation
inquire(file=filename,exist=fexist)
if(.not.fexist) then
write(6,*)' GESINFO: ***ERROR*** ',trim(filename),' NOT AVAILABLE: PROGRAM STOPS'
write(6,*)' GESINFO: ***FATAL ERROR*** ',trim(filename),' NOT AVAILABLE: PROGRAM STOPS'
call stop2(99)
stop
end if
Expand Down Expand Up @@ -339,12 +339,12 @@ subroutine gesinfo
! open the netCDF file
atmges = open_dataset(filename,errcode=iret)
if (iret /=0) then
write(6,*)'GESINFO: ***ERROR*** ',trim(filename),' NOT AVAILABLE: PROGRAM STOPS'
write(6,*)'GESINFO: ***FATAL ERROR*** ',trim(filename),' NOT AVAILABLE: PROGRAM STOPS'
call stop2(99)
endif
sfcges = open_dataset(sfilename,errcode=iret)
if (iret /=0) then
write(6,*)'GESINFO: ***ERROR*** ',trim(sfilename),' NOT AVAILABLE: PROGRAM STOPS'
write(6,*)'GESINFO: ***FATAL ERROR*** ',trim(sfilename),' NOT AVAILABLE: PROGRAM STOPS'
call stop2(99)
endif
! get dimension sizes
Expand Down Expand Up @@ -451,7 +451,7 @@ subroutine gesinfo
! Check for consistency with namelist settings
if (gfshead%jcap/=jcap_b.and..not.regional .or. gfshead%levs/=nsig) then
if (gfshead%levs/=nsig) then
write(6,*)'GESINFO: ***ERROR*** guess levels inconsistent with namelist'
write(6,*)'GESINFO: ***FATAL ERROR*** guess levels inconsistent with namelist'
write(6,*)' guess nsig=',gfshead%levs
write(6,*)' namelist nsig=',nsig
fatal = .true.
Expand All @@ -466,7 +466,7 @@ subroutine gesinfo
fatal = .false.
else
if ( mype == mype_out ) &
write(6,*)'GESINFO: ***ERROR*** guess jcap inconsistent with namelist'
write(6,*)'GESINFO: ***FATAL ERROR*** guess jcap inconsistent with namelist'
fatal = .true.
endif
if ( mype == mype_out ) &
Expand Down
2 changes: 1 addition & 1 deletion src/gsi/netcdfgfs_io.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,7 @@ subroutine read_sfc_anl_(isli_anl)
! open the netCDF file
sfcges = open_dataset(filename,errcode=iret)
if (iret/=0) then
write(6,*) trim(my_name),': ***ERROR*** ',trim(filename),' NOT AVAILABLE: PROGRAM STOPS'
write(6,*) trim(my_name),': ***FATAL ERROR*** ',trim(filename),' NOT AVAILABLE: PROGRAM STOPS'
call stop2(999)
endif

Expand Down
4 changes: 3 additions & 1 deletion src/gsi/read_diag.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,9 @@ subroutine read_radiag_data_nc(diag_status,header_fix,data_fix,data_chan,data_ex

data_fix = diag_status%all_data_fix(diag_status%cur_ob_idx)
data_chan(:) = diag_status%all_data_chan(diag_status%cur_ob_idx,:)
data_extra(:,:) = diag_status%all_data_extra(diag_status%cur_ob_idx,:,:)
if (header_fix%iextra > 0) then
data_extra(:,:) = diag_status%all_data_extra(diag_status%cur_ob_idx,:,:)
endif

diag_status%cur_ob_idx = diag_status%cur_ob_idx + 1

Expand Down
8 changes: 4 additions & 4 deletions src/gsi/read_files.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ subroutine read_files(mype)
endif
if (l4densvar .and. nfldsig/=ntlevs_ens) then
if (mype==0) then
write(6,*)'READ_FILES: ***ERROR*** insufficient atm fcst for 4densvar: PROGRAM STOPS'
write(6,*)'READ_FILES: ***FATAL ERROR*** insufficient atm fcst for 4densvar: PROGRAM STOPS'
do i=1,ntlevs_ens
ihr=nhr_obsbin*(i-1)+nhr_half
present=.false.
Expand All @@ -629,7 +629,7 @@ subroutine read_files(mype)
end do
if (.not.present) then
write(filename,'(''sigf'',i2.2)')ihr
write(6,*)'READ_FILES: ***ERROR*** file ',trim(filename),' missing: PROGRAM STOPS'
write(6,*)'READ_FILES: ***FATAL ERROR*** file ',trim(filename),' missing: PROGRAM STOPS'
endif
end do
endif
Expand All @@ -652,7 +652,7 @@ subroutine read_files(mype)
endif
if (l4densvar .and. nfldsfc/=ntlevs_ens) then
if (mype==0) then
write(6,*)'READ_FILES: ***ERROR*** insufficient sfc fcst for 4densvar: PROGRAM STOPS'
write(6,*)'READ_FILES: ***FATAL ERROR*** insufficient sfc fcst for 4densvar: PROGRAM STOPS'
do i=1,ntlevs_ens
ihr=nhr_obsbin*(i-1)+nhr_half
present=.false.
Expand All @@ -661,7 +661,7 @@ subroutine read_files(mype)
end do
if (.not.present) then
write(filename,'(''sfcf'',i2.2)')ihr
write(6,*)'READ_FILES: ***ERROR*** file ',trim(filename),' missing: PROGRAM STOPS'
write(6,*)'READ_FILES: ***FATAL ERROR*** file ',trim(filename),' missing: PROGRAM STOPS'
endif
end do
endif
Expand Down
3 changes: 1 addition & 2 deletions src/gsi/write_incr.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,9 @@ subroutine write_fv3_inc_ (grd,sp_a,filename,mype_out,gfs_bundle,ibin)
ncstart = (/ jstart(mype+1), 1, 1 /)
nccount = (/ grd%lon1, grd%lat1-1, grd%nsig /)
j1 = 2
j2 = grd%lat1-1
else if (istart(mype+1)+grd%lat1 == grd%nlat+1) then
nccount = (/ grd%lon1, grd%lat1-1, grd%nsig /)
j2 = grd%lat1-2
j2 = grd%lat1-1
end if
call mpi_barrier(mpi_comm_world,ierror)
allocate(out3d(nccount(1),nccount(2),grd%nsig))
Expand Down
3 changes: 3 additions & 0 deletions ush/build_4nco_global.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ export ENKF_MODE="GFS"
export REGRESSION_TESTS="NO"
export UTIL_OPTS="-DBUILD_UTIL_ENKF_GFS=ON -DBUILD_UTIL_MON=ON -DBUILD_UTIL_NCIO=ON"

# Optionally set compiler flags
##export FFLAGS="-check all,noarg_temp_created"

# Prune the directory structure per NCO liking
if [[ "${PRUNE_4NCO:-}" =~ [yYtT] ]]; then
$DIR_ROOT/ush/prune_4nco_global.sh prune
Expand Down
31 changes: 26 additions & 5 deletions ush/prune_4nco_global.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,28 @@ done

# Process doc directories and files
cd $topdir/doc
rlist="EnKF_user_guide GSI_user_guide README.discover"
rlist="EnKF_user_guide GSI_user_guide README.discover Release_Notes.fv3gfs_da.v15.0.0.txt Release_Notes.gfsda.v16.0.0.txt"
for type in $rlist; do
git $string ${type}*
rc=$?
if [[ $rc -ne 0 ]]; then
echo "***ERROR* git $string ${type}"
exit
fi
if [[ "$mode" = "restore" ]]; then
git checkout ${type}*
rc=$?
if [[ $rc -ne 0 ]]; then
echo "***ERROR* git checkout ${type}"
exit
fi
fi
done


# Process jobs directories and files
cd $topdir/jobs
rlist="JGDAS_EFSOI"
for type in $rlist; do
git $string ${type}*
rc=$?
Expand All @@ -86,7 +107,7 @@ done

# Process scripts directories and files
cd $topdir/scripts
rlist="exurma2p5_gsianl.sh"
rlist="exurma2p5_gsianl.sh exgdas_efsoi"
for type in $rlist; do
git $string ${type}*
rc=$?
Expand All @@ -107,7 +128,7 @@ done

# Process ush directories and files
cd $topdir/ush
rlist="Get_Initial_Files gfs_truncate_enkf llsub para refactor_4nco_global run_arw rungsi sub"
rlist="Get_Initial_Files comenkf comgsi gfs_truncate_enkf llsub para refactor_4nco_global run_arw rungsi sub"
for type in $rlist; do
git $string ${type}*
rc=$?
Expand All @@ -128,7 +149,7 @@ done

# Process util directories and files
cd $topdir/util
rlist="Aero Analysis_Utilities Baseline Config Correlated_Obs DTC EFSOI FOV GEN_BE_V2.0 GMI_BUFR MODIS_AOD Misc NCEP NMC_Bkerror README Radar_Monitor Radiance_bias_correction_Utilities Radiance_Utilities Single_Observation bufr_tools global_angupdate gsienvreport.sh python_utilities radar_process zero_biascoeff"
rlist="Aero Analysis_Utilities Baseline Config Conventional_Monitor Correlated_Obs DTC EFSOI Fit2Obs_Scorecard FOV GEN_BE_V2.0 GMI_BUFR MODIS_AOD Minimization_Monitor/data_xtrct Minimization_Monitor/image_gen Minimization_Monitor/nwprod/nam_minmon Misc NCEP NMC_Bkerror Ozone_Monitor/image_gen README Radar_Monitor Radiance_bias_correction_Utilities Radiance_Monitor/nwprod/nam_radmon Radiance_Utilities Single_Observation bufr_tools global_angupdate gsienvreport.sh python_utilities radar_process zero_biascoeff"
for type in $rlist; do
git $string ${type}*
rc=$?
Expand Down Expand Up @@ -170,7 +191,7 @@ done

# Process util/EnKF/gfs/src directories and files
cd $topdir/util/EnKF/gfs/src
rlist="adjustps misc preproc gribmean recenterncio_hybgain recenternemsiop_hybgain"
rlist="adjustps misc preproc gribmean recenterncio_hybgain recenternemsiop_hybgain getnstensmeanp adderrspec getsfcnstensupdp"
for type in $rlist; do
git $string ${type}*
rc=$?
Expand Down
2 changes: 1 addition & 1 deletion util/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if(BUILD_UTIL_BKGERR)
endif()

if(BUILD_UTIL_MON)
add_subdirectory(Conventional_Monitor)
# add_subdirectory(Conventional_Monitor)
add_subdirectory(Ozone_Monitor)
add_subdirectory(Radiance_Monitor)
endif()
Expand Down
1 change: 1 addition & 0 deletions util/EnKF/gfs/src/getsigensmeanp_smooth.fd/getsigensmeanp_smooth_ncep.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ program getsigensmeanp_smooth
filenameout = trim(adjustl(datapath)) // trim(adjustl(filenameout))
! if a 5th arg present, it's a filename to write out ensemble spread
! (only used for ncio)
write_spread_ncio = .false.
if (iargc() > 5) then
call getarg(5,filenameoutsprd)
write_spread_ncio = .true.
Expand Down
2 changes: 0 additions & 2 deletions util/Minimization_Monitor/parm/MinMon_config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,6 @@ if [[ $MINMON_CONFIG -ne 1 ]]; then
export UNCOMPRESS="gunzip -f"
fi

export NDATE=${NDATE:-${NWPROD}/util/exec/ndate}

else
echo "MinMon_config already loaded"
fi
1 change: 0 additions & 1 deletion util/Ozone_Monitor/data_xtrct/ush/run_gfs_gdas.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ fi
idate=`${scripts}/find_cycle.pl -dir ~/nbns/stats/${OZN_SUFFIX} -cyc 1 -run ${run}`
echo "idate = $idate"

export NDATE=/gpfs/dell1/nco/ops/nwprod/prod_util.v1.1.1/exec/ips/ndate
#export START_DATE=2020010500
START_DATE=`${NDATE} +06 $idate`

Expand Down
4 changes: 4 additions & 0 deletions util/Radiance_Monitor/nwprod/gdas_radmon/fix/gdas_radmon_scaninfo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
avhrr_metop-a -52.612 1.182 90
avhrr_n19 -52.612 1.182 90
avhrr_metop-b -52.612 1.182 90
avhrr_metop-c -52.612 1.182 90
mhs_n18 -49.444 1.111 90
mhs_n19 -49.444 1.111 90
airs_aqua -48.90 1.10 90
Expand Down Expand Up @@ -66,5 +67,8 @@
ahi_himawari9 0.00 1.00 90
atms_n21 -52.393 1.10 96
cris-fsr_n21 -48.130 3.333 30
viirs-m_npp -56.280 1.265 90
viirs-m_j1 -56.280 1.265 90
viirs-m_j2 -56.280 1.265 90
RussTreadon-NOAA marked this conversation as resolved.
Show resolved Hide resolved
gmi_gpm 0.00 1.00 221
!sat_sis start step nstep
7 changes: 5 additions & 2 deletions util/Radiance_Monitor/nwprod/radmon_shared/sorc/verf_radang.fd/angle_bias.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ program angle
!
! Initialize variables
iread=0
rread=0.0
npred_radiag = 12

! Read namelist input
Expand Down Expand Up @@ -392,7 +393,8 @@ program angle
nbc_omg(2) = (data_chan(j)%omgnbc)**2
bc_omg(2) = (data_chan(j)%omgbc)**2

cor_fixang(1) = data_chan(j)%bifix(angord+1)
cor_fixang(1) = 0.0
if (.not.netcdf) cor_fixang(1) = data_chan(j)%bifix(angord+1)
cor_lapse(1) = data_chan(j)%bilap
cor_lapse2(1) = data_chan(j)%bilap2
cor_const(1) = data_chan(j)%bicons
Expand All @@ -413,7 +415,8 @@ program angle
cor_ordang1(1) = 0.0
endif

cor_fixang(2) = (data_chan(j)%bifix(angord+1))**2
cor_fixang(2) = 0.0
if (.not.netcdf) cor_fixang(2) = (data_chan(j)%bifix(angord+1))**2
cor_lapse(2) = (data_chan(j)%bilap)**2
cor_lapse2(2) = (data_chan(j)%bilap2)**2
cor_const(2) = (data_chan(j)%bicons)**2
Expand Down
Loading