From babd5d0578473b1bfa13008acde074a771282f20 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 23 Feb 2024 20:05:26 -0500 Subject: [PATCH 1/4] add new physical constant metadata for Thompson MP --- ccpp/data/GFS_typedefs.F90 | 3 ++- ccpp/data/GFS_typedefs.meta | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 9e8bfc7d3..a39d70679 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -10,7 +10,8 @@ module GFS_typedefs con_csol, con_epsqs, con_rocp, con_rog, & con_omega, con_rerth, con_psat, karman, rainmin,& con_c, con_plnk, con_boltz, con_solr_2008, & - con_solr_2002, con_thgni, con_1ovg + con_solr_2002, con_thgni, con_1ovg, con_rgas, & + con_avgd, con_amd, con_amw use module_radsw_parameters, only: topfsw_type, sfcfsw_type use module_radlw_parameters, only: topflw_type, sfcflw_type diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 2fee7ba12..cd19e4874 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -10424,3 +10424,31 @@ dimensions = () type = real kind = kind_phys +[con_rgas] + standard_name = molar_gas_constant + long_name = universal ideal molar gas constant + units = J K-1 mol-1 + dimensions = () + type = real + kind = kind_phys +[con_avgd] + standard_name = avogadro_consant + long_name = Avogadro constant + units = mol-1 + dimensions = () + type = real + kind = kind_phys +[con_amd] + standard_name = molecular_weight_of_dry_air + long_name = molecular weight of dry air + units = g mol-1 + dimensions = () + type = real + kind = kind_phys +[con_amw] + standard_name = molecular_weight_of_water_vapor + long_name = molecular weight of water vapor + units = g mol-1 + dimensions = () + type = real + kind = kind_phys From b936d9fbf203d380207a20e725904e923c11201d Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 29 Oct 2024 13:14:02 -0400 Subject: [PATCH 2/4] update ccpp/physics for testing --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..4e3c2bb97 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev + #url = https://github.com/ufs-community/ccpp-physics + #branch = ufs/dev + url = https://github.com/grantfirl/ccpp-physics + branch = rrfsv1-to-ufs/dev3 [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index f3eeb3442..88c9df5d1 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit f3eeb3442775b7239d98e3d09acc6d4f1d42233e +Subproject commit 88c9df5d1814adc5e197c005c5a71773a9051be8 From 915e44e963b804684b872c5545feb9416e742f72 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 21 Nov 2024 14:04:32 -0500 Subject: [PATCH 3/4] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 3d4754358..9dffb7e1c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3d475435854820288e7bafa9f9ce295230048b6f +Subproject commit 9dffb7e1cd5fceebec065299c791e65e3a30e0c2 From 81b79f00f76cc54eb65fa8fcf80336bbca455149 Mon Sep 17 00:00:00 2001 From: jkbk2004 Date: Mon, 25 Nov 2024 07:53:03 -0600 Subject: [PATCH 4/4] physics hash update and revert chenge in gitmodules --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4e3c2bb97..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/ufs-community/ccpp-physics - #branch = ufs/dev - url = https://github.com/grantfirl/ccpp-physics - branch = rrfsv1-to-ufs/dev3 + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 9dffb7e1c..6e0467ad0 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 9dffb7e1cd5fceebec065299c791e65e3a30e0c2 +Subproject commit 6e0467ad07a2231d298dc3be91a923c934354a7f