Skip to content

Update MGBF to use 32 filtering levels and fix memory leak #525

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

Merged
ShunLiu-NOAA merged 9 commits into from
Jan 23, 2026
Merged

Update MGBF to use 32 filtering levels and fix memory leak #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8d9a879
update mgbf namelists
Jan 22, 2026
2593215
add memory leak fix to workaround code
Jan 22, 2026
616ff12
add some comments about workaround status to build script
Jan 22, 2026
db81b58
move ps to last analysis variable in yaml
Jan 22, 2026
e942c94
set ctest wall clock time to original setting
Jan 22, 2026
f210fc4
update test references
Jan 22, 2026
777d455
Merge remote-tracking branch 'origin/develop' into feature/bugfix_mgb…
Jan 22, 2026
df1081a
revert some accidental changes to jcb templates
Jan 22, 2026
5836da2
update refl test output for earlier PR
Jan 23, 2026
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: 4 additions & 2 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,10 @@ if [[ $BUILD_WORKAROUND == 'YES' ]]; then
cp ../sorc/_workaround_/saber/gsi_covariance_mod.f90 ../sorc/saber/src/saber/gsi/covariance/gsi_covariance_mod.f90
cp ../sorc/_workaround_/saber/gsi_grid_mod.f90 ../sorc/saber/src/saber/gsi/grid/gsi_grid_mod.f90
cp ../sorc/_workaround_/saber/Geometry.cc ../sorc/saber/src/saber/interpolation/Geometry.cc
# No PR for gsibec yet
# No PR for full gsibec changes
# gsibec PR #88 for qoption2: https://github.com/GEOS-ESM/GSIbec/pull/88
cp ../sorc/_workaround_/gsibec/* ../sorc/gsibec/src/gsibec/gsi
# No PR for fv3jedi yet
# fv3-jedi PR #1447: https://github.com/JCSDA-internal/fv3-jedi/pull/1447
cp ../sorc/_workaround_/fv3-jedi/fv3jedi_linvarcha_c2a_mod.f90 ../sorc/fv3-jedi/src/fv3jedi/LinearVariableChange/Control2Analysis/

# Workaround for adding MGBF
Expand All @@ -292,6 +293,7 @@ if [[ $BUILD_WORKAROUND == 'YES' ]]; then

# Workaround for reading reflectivity from phy_data.nc file
# PR: https://github.com/JCSDA-internal/fv3-jedi/pull/1442
# Merged so this can be removed during the next submodule update
cp ../sorc/_workaround_/fv3-jedi/fv3jedi_io_fms2_mod.f90 ../sorc/fv3-jedi/src/fv3jedi/IO/FV3Restart

fi
Expand Down
9 changes: 5 additions & 4 deletions fix/mgbf/mgbf_p196_14x14.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
&PARAMETERS_MGBETA
mg_ampl01=5.0,mg_ampl02=1.0,mg_ampl03=2.0,
mg_weig1=20.,mg_weig2=135.,mg_weig3=15000.,mg_weig4=1.,
hx=6,hy=6,hz=12,p=2,
mg_ampl01=1.1,mg_ampl02=0.9,mg_ampl03=2.0,
mg_weig1=20.,mg_weig2=120.,mg_weig3=15000.,mg_weig4=1.,
hx=6,hy=6,hz=6,p=2,
mgbf_line=.true., mgbf_proc=5,
lm_a=65,lm=65,km2=0,km3=6,
lm_a=65,lm=32,km2=0,km3=6,
coef_normalization_const=1.2236
nxPE=14,nyPE=14,im_filt=16,jm_filt=16,
nm0 = 224,
mm0 = 224,
l_vertical_filter=.true.,
l_anal_sub_of_filt=.true.,
gm_max=2,
l_for_localization=.true.,
ldelta=.false.,
Expand Down
9 changes: 5 additions & 4 deletions fix/mgbf/mgbf_p196_14x14_dbz.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
&PARAMETERS_MGBETA
mg_ampl01=5.0,mg_ampl02=1.0,mg_ampl03=2.0,
mg_weig1=20.,mg_weig2=135.,mg_weig3=15000.,mg_weig4=1.,
hx=6,hy=6,hz=12,p=2,
mg_ampl01=1.1,mg_ampl02=0.9,mg_ampl03=2.0,
mg_weig1=20.,mg_weig2=120.,mg_weig3=15000.,mg_weig4=1.,
hx=6,hy=6,hz=6,p=2,
mgbf_line=.true., mgbf_proc=5,
lm_a=65,lm=65,km2=0,km3=13,
lm_a=65,lm=32,km2=0,km3=13,
coef_normalization_const=1.2236
nxPE=14,nyPE=14,im_filt=16,jm_filt=16,
nm0 = 224,
mm0 = 224,
l_vertical_filter=.true.,
l_anal_sub_of_filt=.true.,
gm_max=2,
l_for_localization=.true.,
ldelta=.false.,
Expand Down
2 changes: 1 addition & 1 deletion rrfs-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ set (src_yaml "${CMAKE_SOURCE_DIR}/rrfs-test/testinput")
# set (fv3-jedi_data_testinput_tier_1_local "$ENV{FV3_JEDI_TESTFILES}/fv3-jedi-data/testinput_tier_1")

# Add some general job settings here
set(MPI_ARGS "${MPI_ARGS} --time=00:45:00 --exclusive")
set(MPI_ARGS "${MPI_ARGS} --time=00:30:00 --exclusive")
set(RESTORE_MPI_ARGS ${MPI_ARGS})

if(FV3_DYCORE)
Expand Down
72 changes: 36 additions & 36 deletions rrfs-test/testoutput/rrfs-fv3jedi-3denvar_mgbf.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
CostJo : Nonlinear Jo(aircar_airTemperature_133) = 1.7109300271492390e+04, nobs = 26912, Jo/n = 6.3574986145557333e-01, err = 9.0703353310406665e-01
CostJo : Nonlinear Jo(aircar_specificHumidity_133) = 1.1576103821861009e+03, nobs = 3846, Jo/n = 3.0099073899794615e-01, err = 1.8463121387412148e-03
CostJo : Nonlinear Jo(aircar_winds_233) = 4.5918477878982012e+04, nobs = 57216, Jo/n = 8.0254610386923264e-01, err = 2.6503185933157223e+00
CostFunction: Nonlinear J = 6.4185388532660501e+04
DRPCGMinimizer: reduction in residual norm = 2.3915261402596465e-03
CostJo : Nonlinear Jo(aircar_airTemperature_133) = 1.7109300271492430e+04, nobs = 26912, Jo/n = 6.3574986145557477e-01, err = 9.0703353310406665e-01
CostJo : Nonlinear Jo(aircar_specificHumidity_133) = 1.1576104621804134e+03, nobs = 3846, Jo/n = 3.0099075979729939e-01, err = 1.8463121163155127e-03
CostJo : Nonlinear Jo(aircar_winds_233) = 4.5918477878981983e+04, nobs = 57216, Jo/n = 8.0254610386923209e-01, err = 2.6503185933157223e+00
CostFunction: Nonlinear J = 6.4185388612654824e+04
DRPCGMinimizer: reduction in residual norm = 5.8376804357152716e-03
CostFunction::addIncrement: Analysis:
----------------------------------------------------------------------------------------------------
State print | number of fields = 28 | cube sphere face size: C420
eastward_wind | Min:-2.7017492294311523e+01 Max:+5.5174955334850473e+01 RMS:+1.3316813676814377e+01
northward_wind | Min:-4.4834327488490288e+01 Max:+4.0178013622531978e+01 RMS:+6.4888598390319281e+00
air_temperature | Min:+1.9402627011131145e+02 Max:+3.1449734497070312e+02 RMS:+2.5825612242931044e+02
eastward_wind | Min:-2.7017492294311523e+01 Max:+5.5337978184153805e+01 RMS:+1.3323563083296090e+01
northward_wind | Min:-4.5226179348417212e+01 Max:+4.0336882262153154e+01 RMS:+6.4935156857873961e+00
air_temperature | Min:+1.9402618026858133e+02 Max:+3.1449734497070312e+02 RMS:+2.5825978148033317e+02
air_pressure_thickness | Min:+1.4039907836914062e+02 Max:+3.3267851562500000e+03 RMS:+1.7747128794076129e+03
water_vapor_mixing_ratio_wrt_moist_air | Min:+0.0000000000000000e+00 Max:+2.6436080429250705e-02 RMS:+5.5190318304343513e-03
water_vapor_mixing_ratio_wrt_moist_air | Min:+0.0000000000000000e+00 Max:+2.6475114050935635e-02 RMS:+5.5190455365890078e-03
cloud_liquid_ice | Min:+0.0000000000000000e+00 Max:+3.5491219023242593e-04 RMS:+2.6466693180263384e-06
cloud_liquid_water | Min:+0.0000000000000000e+00 Max:+1.4309773687273264e-03 RMS:+1.9256935244694528e-05
ozone_mass_mixing_ratio | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486298062797521e-06
geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223748e+03
ozone_mass_mixing_ratio | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486332492474275e-06
geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223739e+03
f10m | Min:+1.0004938840866089e+00 Max:+1.0948654413223267e+00 RMS:+1.0188698647586811e+00
slmsk | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+00 RMS:+7.8767192390790086e-01
sheleg | Min:+0.0000000000000000e+00 Max:+1.6966506958007812e+01 RMS:+2.0734254733790997e-01
skin_temperature_at_surface | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841762e+02
skin_temperature_at_surface | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841756e+02
vtype | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+01 RMS:+7.1648734770793263e+00
stype | Min:+0.0000000000000000e+00 Max:+1.6000000000000000e+01 RMS:+5.0688774416549585e+00
vfrac | Min:+0.0000000000000000e+00 Max:+9.9000000953674316e-01 RMS:+4.4064937959870992e-01
soilt | Min:+2.7023922729492188e+02 Max:+3.2296466064453125e+02 RMS:+2.9475315924680575e+02
soilm | Min:+1.4970073476433754e-02 Max:+1.0000000000000000e+00 RMS:+6.3592927195821791e-01
eastward_wind_at_surface | Min:-1.2974018096923828e+01 Max:+1.2164360046386719e+01 RMS:+3.6171520010516645e+00
northward_wind_at_surface | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589296e+00
air_pressure_at_surface | Min:+6.6027478633412946e+04 Max:+1.0240633677673340e+05 RMS:+9.6259622526740102e+04
northward_wind_at_surface | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589292e+00
air_pressure_at_surface | Min:+6.6027444898754300e+04 Max:+1.0240633677673340e+05 RMS:+9.6259060231809315e+04
rain_water | Min:+0.0000000000000000e+00 Max:+1.7932932823896408e-03 RMS:+1.6047798774338740e-05
snow_water | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177579e-05
snow_water | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177572e-05
graupel | Min:+0.0000000000000000e+00 Max:+6.5326219191774726e-04 RMS:+3.0288534886145332e-06
cloud_droplet_number_concentration | Min:+0.0000000000000000e+00 Max:+1.5055759360000000e+09 RMS:+2.0745188331041779e+07
cloud_ice_number_concentration | Min:+0.0000000000000000e+00 Max:+5.0166070000000000e+06 RMS:+2.8482317076120682e+04
rain_number_concentration | Min:+0.0000000000000000e+00 Max:+8.6749025000000000e+05 RMS:+2.1760084842806405e+03
upward_air_velocity | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424862e-02
upward_air_velocity | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424869e-02
----------------------------------------------------------------------------------------------------
CostJo : Nonlinear Jo(aircar_airTemperature_133) = 6843.860151279297, nobs = 26912, Jo/n = 0.2543051483085351, err = 0.9070335331040666
CostJo : Nonlinear Jo(aircar_specificHumidity_133) = 603.6653298314316, nobs = 3846, Jo/n = 0.1569592641267373, err = 0.001846312138741215
CostJo : Nonlinear Jo(aircar_winds_233) = 14679.73366955117, nobs = 57216, Jo/n = 0.2565669335422114, err = 2.650318593315722
CostFunction: Nonlinear J = 22127.2591506619
DRPCGMinimizer: reduction in residual norm = 0.009922760950611767
CostJo : Nonlinear Jo(aircar_airTemperature_133) = 6436.905565048216, nobs = 26912, Jo/n = 0.2391834707583315, err = 0.9070335331040666
CostJo : Nonlinear Jo(aircar_specificHumidity_133) = 567.2227929091773, nobs = 3846, Jo/n = 0.1474838255094065, err = 0.001846312116315513
CostJo : Nonlinear Jo(aircar_winds_233) = 13872.52113167875, nobs = 57216, Jo/n = 0.2424587725754815, err = 2.650318593315722
CostFunction: Nonlinear J = 20876.64948963614
DRPCGMinimizer: reduction in residual norm = 0.03839370510165859
CostFunction::addIncrement: Analysis:
----------------------------------------------------------------------------------------------------
State print | number of fields = 28 | cube sphere face size: C420
eastward_wind | Min:-2.7017492294311523e+01 Max:+5.5192769591250538e+01 RMS:+1.3316933439333850e+01
northward_wind | Min:-4.4851364256940208e+01 Max:+4.0159271968280521e+01 RMS:+6.4888280115000994e+00
air_temperature | Min:+1.9402629001407439e+02 Max:+3.1449734497070312e+02 RMS:+2.5825612606676503e+02
eastward_wind | Min:-2.7017492294311523e+01 Max:+5.5350232350503440e+01 RMS:+1.3324101054747812e+01
northward_wind | Min:-4.5260137852209439e+01 Max:+4.0313107373583833e+01 RMS:+6.4933813155777864e+00
air_temperature | Min:+1.9402625682539374e+02 Max:+3.1449734497070312e+02 RMS:+2.5825977763169965e+02
air_pressure_thickness | Min:+1.4039907836914062e+02 Max:+3.3267851562500000e+03 RMS:+1.7747128794076129e+03
water_vapor_mixing_ratio_wrt_moist_air | Min:+0.0000000000000000e+00 Max:+2.6407767042489927e-02 RMS:+5.5190758337462517e-03
water_vapor_mixing_ratio_wrt_moist_air | Min:+0.0000000000000000e+00 Max:+2.6391229895913141e-02 RMS:+5.5192094526611418e-03
cloud_liquid_ice | Min:+0.0000000000000000e+00 Max:+3.5491219023242593e-04 RMS:+2.6466693180263384e-06
cloud_liquid_water | Min:+0.0000000000000000e+00 Max:+1.4309773687273264e-03 RMS:+1.9256935244694528e-05
ozone_mass_mixing_ratio | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486297648910050e-06
geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223748e+03
ozone_mass_mixing_ratio | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486329555585363e-06
geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223739e+03
f10m | Min:+1.0004938840866089e+00 Max:+1.0948654413223267e+00 RMS:+1.0188698647586811e+00
slmsk | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+00 RMS:+7.8767192390790086e-01
sheleg | Min:+0.0000000000000000e+00 Max:+1.6966506958007812e+01 RMS:+2.0734254733790997e-01
skin_temperature_at_surface | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841762e+02
skin_temperature_at_surface | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841756e+02
vtype | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+01 RMS:+7.1648734770793263e+00
stype | Min:+0.0000000000000000e+00 Max:+1.6000000000000000e+01 RMS:+5.0688774416549585e+00
vfrac | Min:+0.0000000000000000e+00 Max:+9.9000000953674316e-01 RMS:+4.4064937959870992e-01
soilt | Min:+2.7023922729492188e+02 Max:+3.2296466064453125e+02 RMS:+2.9475315924680575e+02
soilm | Min:+1.4970073476433754e-02 Max:+1.0000000000000000e+00 RMS:+6.3592927195821791e-01
eastward_wind_at_surface | Min:-1.2974018096923828e+01 Max:+1.2164360046386719e+01 RMS:+3.6171520010516645e+00
northward_wind_at_surface | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589296e+00
air_pressure_at_surface | Min:+6.6027478491835107e+04 Max:+1.0240633677673340e+05 RMS:+9.6259615036528034e+04
northward_wind_at_surface | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589292e+00
air_pressure_at_surface | Min:+6.6027443499503541e+04 Max:+1.0240633677673340e+05 RMS:+9.6259045050583285e+04
rain_water | Min:+0.0000000000000000e+00 Max:+1.7932932823896408e-03 RMS:+1.6047798774338740e-05
snow_water | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177579e-05
snow_water | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177572e-05
graupel | Min:+0.0000000000000000e+00 Max:+6.5326219191774726e-04 RMS:+3.0288534886145332e-06
cloud_droplet_number_concentration | Min:+0.0000000000000000e+00 Max:+1.5055759360000000e+09 RMS:+2.0745188331041779e+07
cloud_ice_number_concentration | Min:+0.0000000000000000e+00 Max:+5.0166070000000000e+06 RMS:+2.8482317076120682e+04
rain_number_concentration | Min:+0.0000000000000000e+00 Max:+8.6749025000000000e+05 RMS:+2.1760084842806405e+03
upward_air_velocity | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424862e-02
upward_air_velocity | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424869e-02
----------------------------------------------------------------------------------------------------
CostJo : Nonlinear Jo(aircar_airTemperature_133) = 6841.786530258552, nobs = 26912, Jo/n = 0.2542280963978356, err = 0.9070335331040666
CostJo : Nonlinear Jo(aircar_specificHumidity_133) = 603.490984050765, nobs = 3846, Jo/n = 0.1569139324104953, err = 0.001846312138741215
CostJo : Nonlinear Jo(aircar_winds_233) = 14676.85832086471, nobs = 57216, Jo/n = 0.2565166792656724, err = 2.650318593315722
CostFunction: Nonlinear J = 22122.13583517403
CostJo : Nonlinear Jo(aircar_airTemperature_133) = 6423.303636715884, nobs = 26912, Jo/n = 0.2386780483321895, err = 0.9070335331040666
CostJo : Nonlinear Jo(aircar_specificHumidity_133) = 566.3106398381906, nobs = 3846, Jo/n = 0.1472466562241785, err = 0.001846312116315513
CostJo : Nonlinear Jo(aircar_winds_233) = 13847.58089511543, nobs = 57216, Jo/n = 0.2420228763827501, err = 2.650318593315722
CostFunction: Nonlinear J = 20837.1951716695
Loading