diff --git a/CHANGELOG.md b/CHANGELOG.md index 7afa9803..fac3a5bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/Process_Library/GOCART2G_MieMod.F90 b/Process_Library/GOCART2G_MieMod.F90 index 15966ba2..572963d7 100644 --- a/Process_Library/GOCART2G_MieMod.F90 +++ b/Process_Library/GOCART2G_MieMod.F90 @@ -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 diff --git a/Process_Library/MieQuery.H b/Process_Library/MieQuery.H index 51db0438..bda4f08d 100644 --- a/Process_Library/MieQuery.H +++ b/Process_Library/MieQuery.H @@ -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