From a28b1b929b2fefc4581dc58f5370303ea3af3d31 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Tue, 28 Nov 2023 00:35:31 -0500 Subject: [PATCH 1/3] corrected reading 'rhod' --- CHANGELOG.md | 1 + Process_Library/GOCART2G_MieMod.F90 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e762d713..dceaec54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ 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') - 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 a595d8d4..4c8f9730 100644 --- a/Process_Library/GOCART2G_MieMod.F90 +++ b/Process_Library/GOCART2G_MieMod.F90 @@ -290,7 +290,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 From 32c0288655988d0a06662cc43622bb83a129be7a Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Tue, 28 Nov 2023 11:42:57 -0500 Subject: [PATCH 2/3] added missing output rhop --- Process_Library/MieQuery.H | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Process_Library/MieQuery.H b/Process_Library/MieQuery.H index 51db0438..047162ae 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, rhod) + endif + if(present(rhod)) then rhod = __RHINTERP2__(this%rhod, irh, arh, bin, rhod) endif From 7fabc21e1fd57a08cb5032812093498a2e86ac3b Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Thu, 30 Nov 2023 12:17:47 -0500 Subject: [PATCH 3/3] more typo fix --- Process_Library/MieQuery.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Process_Library/MieQuery.H b/Process_Library/MieQuery.H index 047162ae..bda4f08d 100644 --- a/Process_Library/MieQuery.H +++ b/Process_Library/MieQuery.H @@ -131,7 +131,7 @@ endif if(present(rhop)) then - rhop = __RHINTERP2__(this%rhop, irh, arh, bin, rhod) + rhop = __RHINTERP2__(this%rhop, irh, arh, bin, rhop) endif if(present(rhod)) then