From 9b2d1831c93f61118bc824d510892a9569d7c7ae Mon Sep 17 00:00:00 2001 From: Michael Duda Date: Wed, 30 Aug 2023 22:21:34 +0000 Subject: [PATCH 1/4] Update version number to 8.0.2 --- README.md | 2 +- src/core_atmosphere/Registry.xml | 2 +- src/core_init_atmosphere/Registry.xml | 2 +- src/core_landice/Registry.xml | 2 +- src/core_ocean/Registry.xml | 2 +- src/core_seaice/Registry.xml | 2 +- src/core_sw/Registry.xml | 2 +- src/core_test/Registry.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5765206560..148dcf2a76 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MPAS-v8.0.1 +MPAS-v8.0.2 ==== The Model for Prediction Across Scales (MPAS) is a collaborative project for diff --git a/src/core_atmosphere/Registry.xml b/src/core_atmosphere/Registry.xml index 4e50bea204..42630440c5 100644 --- a/src/core_atmosphere/Registry.xml +++ b/src/core_atmosphere/Registry.xml @@ -1,5 +1,5 @@ - + diff --git a/src/core_init_atmosphere/Registry.xml b/src/core_init_atmosphere/Registry.xml index e40f5c3722..9f5abc147e 100644 --- a/src/core_init_atmosphere/Registry.xml +++ b/src/core_init_atmosphere/Registry.xml @@ -1,5 +1,5 @@ - + diff --git a/src/core_landice/Registry.xml b/src/core_landice/Registry.xml index 42e2a99254..91db32ee9a 100644 --- a/src/core_landice/Registry.xml +++ b/src/core_landice/Registry.xml @@ -1,5 +1,5 @@ - + diff --git a/src/core_ocean/Registry.xml b/src/core_ocean/Registry.xml index c084373916..a5f42e4d4a 100644 --- a/src/core_ocean/Registry.xml +++ b/src/core_ocean/Registry.xml @@ -1,5 +1,5 @@ - + - + - + diff --git a/src/core_test/Registry.xml b/src/core_test/Registry.xml index f2ffbbf18d..102cce6de3 100644 --- a/src/core_test/Registry.xml +++ b/src/core_test/Registry.xml @@ -1,5 +1,5 @@ - + From 35b28c760a6ac6586a59a4e76ff51dc1ceefe45a Mon Sep 17 00:00:00 2001 From: Michael Duda Date: Tue, 5 Mar 2024 19:01:44 +0000 Subject: [PATCH 2/4] Generalize mpas_sphere_angle function to work for non-unit-radius spheres The methods previously employed in the mpas_sphere_angle function for computing the side lengths of a spherical triangle were only applicable to unit-radius spheres. This commit generalizes the computation of these side lengths so that the mpas_sphere_angle function can be used to compute spherical angles on spheres of arbitrary radius. --- src/operators/mpas_geometry_utils.F | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/operators/mpas_geometry_utils.F b/src/operators/mpas_geometry_utils.F index ba9d49522a..1a50a02e60 100644 --- a/src/operators/mpas_geometry_utils.F +++ b/src/operators/mpas_geometry_utils.F @@ -42,9 +42,10 @@ real (kind=RKIND) function mpas_sphere_angle(ax, ay, az, bx, by, bz, cx, cy, cz) real (kind=RKIND) :: s ! Semiperimeter of the triangle real (kind=RKIND) :: sin_angle - a = acos(max(min(bx*cx + by*cy + bz*cz,1.0_RKIND),-1.0_RKIND)) ! Eqn. (3) - b = acos(max(min(ax*cx + ay*cy + az*cz,1.0_RKIND),-1.0_RKIND)) ! Eqn. (2) - c = acos(max(min(ax*bx + ay*by + az*bz,1.0_RKIND),-1.0_RKIND)) ! Eqn. (1) + + a = mpas_arc_length(bx, by, bz, cx, cy, cz) + b = mpas_arc_length(ax, ay, az, cx, cy, cz) + c = mpas_arc_length(ax, ay, az, bx, by, bz) ABx = bx - ax ABy = by - ay From bfdc9d205ab195756c87194be05c6255139b4954 Mon Sep 17 00:00:00 2001 From: Michael Duda Date: Thu, 21 Mar 2024 21:26:25 +0000 Subject: [PATCH 3/4] Initialize mvd_r and mvd_c before first use in Thompson microphysics scheme This commit initializes two local variables, mvd_r and mvd_c, in the mp_thompson routine to avoid the potential use of uninitialized memory. Note: Identical changes to those included in this commit have been introduced into newer versions of the Thompson microphysics scheme, and so the changes here can be considered a back-port of fixes. --- src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F b/src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F index a2d28456b7..083868693a 100644 --- a/src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F +++ b/src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F @@ -1583,6 +1583,8 @@ subroutine mp_thompson (qv1d, qc1d, qi1d, qr1d, qs1d, qg1d, ni1d, & smod(k) = 0. smoe(k) = 0. smof(k) = 0. + mvd_r(k) = 0. + mvd_c(k) = 0. enddo !+---+-----------------------------------------------------------------+ From 9e1e1b44646d82ecce472bdaea77e5f56f7c3985 Mon Sep 17 00:00:00 2001 From: Laura Fowler Date: Sat, 23 Mar 2024 08:44:54 -0600 Subject: [PATCH 4/4] * In ./src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F, corrected the units of the variable dx_p from meters to kilometers (dx_p is used in the Thompson parameterization of the cloud fraction). --- .../physics/mpas_atmphys_driver_cloudiness.F | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F b/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F index 9e444ae2f7..93e833b328 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F +++ b/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F @@ -51,7 +51,10 @@ module mpas_atmphys_driver_cloudiness ! Laura D. Fowler (laura@ucar.edu) / 2016-07-05. ! * since we removed the local variable radt_cld_scheme from mpas_atmphys_vars.F, now defines radt_cld_scheme ! as a pointer to config_radt_cld_scheme. -! Laura D. Fowler (laura@ucar.edu) / 2917-02-16. +! Laura D. Fowler (laura@ucar.edu) / 2017-02-16. +! * this is a bug fix. dx_p is converted from meters to kilometers prior to calling the thompson parameterization +! of the cloud fraction. +! Laura D. Fowler (laura@ucar.edu) / 2024-03-23. contains @@ -119,6 +122,8 @@ subroutine cloudiness_from_MPAS(configs,mesh,diag_physics,sfc_input,its,ite) do j = jts,jte do i = its,ite dx_p(i,j) = len_disp / meshDensity(i)**0.25 + !conversion of dx_p from meters to kilometers. + dx_p(i,j) = dx_p(i,j)*0.001 xland_p(i,j) = xland(i) enddo