Skip to content

Commit

Permalink
Merge pull request #257 from GEOS-ESM/bugfix/wjiang/rhod_table
Browse files Browse the repository at this point in the history
corrected reading 'rhod'
  • Loading branch information
jrjoshi1 authored Aug 12, 2024
2 parents f3a0e9b + 907cb8a commit bfdb1af
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed


- corrected reading variable 'rhod' from files ( it was mispelled as 'rhop')

- Silenced unwarranted error messages from wavelength/channel retrieval functions occurring when 470nm and/or 870nm channels are not included in GOCART resource file.

- Add explicit `find_package()` calls for missing dependencies for MAPL for builds with spack-stack. Will eventually be fixed in MAPL in later versions
- Corrected the units of the gravimetric soil moisture to percent instead of fractional in the FENGSHA dust scheme.

Expand Down
2 changes: 1 addition & 1 deletion Process_Library/GOCART2G_MieMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ type(GOCART2G_Mie) function GOCART2G_MieCreate ( MieFile, wavelengths, nmom, rc
endif

! Dry particle density (will be pulled from wet particle radius)
rc = nf90_inq_varid(ncid,'rhop',ivarid)
rc = nf90_inq_varid(ncid,'rhod',ivarid)
if(rc .ne. NF90_NOERR) then ! not in table, fill in dummy variable
rhod_table = -999.
else
Expand Down
4 changes: 4 additions & 0 deletions Process_Library/MieQuery.H
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@
gf = __RHINTERP2__(this%gf, irh, arh, bin, gf)
endif

if(present(rhop)) then
rhop = __RHINTERP2__(this%rhop, irh, arh, bin, rhop)
endif

if(present(rhod)) then
rhod = __RHINTERP2__(this%rhod, irh, arh, bin, rhod)
endif
Expand Down

0 comments on commit bfdb1af

Please sign in to comment.