From e3b264f10676f254a2ab2cde672b404e849f5a77 Mon Sep 17 00:00:00 2001 From: Janak Joshi Date: Wed, 26 Feb 2025 15:09:41 -0500 Subject: [PATCH 1/2] Reverted to intended 'rhod' reading --- Process_Library/GOCART2G_MieMod.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Process_Library/GOCART2G_MieMod.F90 b/Process_Library/GOCART2G_MieMod.F90 index 572963d7..2ed4ef76 100644 --- a/Process_Library/GOCART2G_MieMod.F90 +++ b/Process_Library/GOCART2G_MieMod.F90 @@ -65,7 +65,7 @@ module GOCART2G_MieMod real, pointer :: pmom(:,:,:,:,:) => Null() ! (r,c,b,m,p) moments of phase function real, pointer :: gf(:,:) => Null() ! (r,b) hygroscopic growth factor real, pointer :: rhop(:,:) => Null() ! (r,b) wet particle density [kg m-3] - real, pointer :: rhod(:,:) => Null() ! (r,b) wet particle density [kg m-3] + real, pointer :: rhod(:,:) => Null() ! (r,b) dry particle density [kg m-3] real, pointer :: vol(:,:) => Null() ! (r,b) wet particle volume [m3 kg-1] real, pointer :: area(:,:) => Null() ! (r,b) wet particle cross section [m2 kg-1] real, pointer :: refr(:,:,:) => Null() ! (r,c,b) real part of refractive index @@ -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,'rhod',ivarid) + rc = nf90_inq_varid(ncid,'rhop',ivarid) if(rc .ne. NF90_NOERR) then ! not in table, fill in dummy variable rhod_table = -999. else From f3a69553552e5024e40395e257fd37db7101a595 Mon Sep 17 00:00:00 2001 From: "Janak R. Joshi" <144248063+jrjoshi1@users.noreply.github.com> Date: Wed, 26 Mar 2025 13:56:27 -0400 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de7d2753..1def607d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Use 'CA' component name to identify carbonaceous contributions to PM in UFS diagnostic calculations. These contributions were missing due to changes in field names. - Add replay import patch for ozone. -- corrected reading variable 'rhod' from files ( it was mispelled as 'rhop') +- corrected reading variable 'rhod' from files ( it was mispelled as 'rhop') - it is reverted now - 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.