From f0c80761e8731674bda14615146646ccf9644d13 Mon Sep 17 00:00:00 2001 From: rhaesung Date: Fri, 3 Jan 2025 21:03:27 +0000 Subject: [PATCH 1/8] unit correction --- ccpp/driver/GFS_diagnostics.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index d2a8bdf5a..41eae554f 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -1411,7 +1411,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%axes = 2 ExtDiag(idx)%name = 'pevpr_ave' ExtDiag(idx)%desc = 'averaged potential evaporation rate' - ExtDiag(idx)%unit = 'W/m**2' + ExtDiag(idx)%unit = 'mm/s' ExtDiag(idx)%mod_name = 'gfs_phys' ExtDiag(idx)%time_avg = .TRUE. allocate (ExtDiag(idx)%data(nblks)) @@ -2225,7 +2225,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%axes = 2 ExtDiag(idx)%name = 'pevpr' ExtDiag(idx)%desc = 'instantaneous surface potential evaporation' - ExtDiag(idx)%unit = 'W/m**2' + ExtDiag(idx)%unit = 'mm/s' ExtDiag(idx)%mod_name = 'gfs_phys' allocate (ExtDiag(idx)%data(nblks)) do nb = 1,nblks From e8fe36d618f5175603a3a36854dbc03037df5317 Mon Sep 17 00:00:00 2001 From: rhaesung Date: Fri, 3 Jan 2025 21:04:15 +0000 Subject: [PATCH 2/8] update .gitmodules and ccpp/physics --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..d7c02a1ed 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/rhaesung/ccpp-physics + branch = hr5 [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index a7fe01c4d..1ffea266b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit a7fe01c4da43955de38bac8c39667478cd03c711 +Subproject commit 1ffea266b67849a59c5b30e9a7f2fd6722b38437 From f7afd93684138cd0f838d8e1df276f4680f45cd1 Mon Sep 17 00:00:00 2001 From: rhaesung Date: Tue, 7 Jan 2025 19:09:07 +0000 Subject: [PATCH 3/8] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 1ffea266b..80d5c4014 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 1ffea266b67849a59c5b30e9a7f2fd6722b38437 +Subproject commit 80d5c40141cf0b441487392ca5fec2748cee2fde From 3e93decb4cfa620c9dddadb0fc04c88f180e4d73 Mon Sep 17 00:00:00 2001 From: rhaesung Date: Tue, 21 Jan 2025 22:45:17 +0000 Subject: [PATCH 4/8] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 0df495121..7f1a1d85d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 0df495121a77d2fbaa113b8d687e129ff341757d +Subproject commit 7f1a1d85d89f423edcef7c71775df3a8135e9242 From d4f767d354bdbb158492317fc4e5a5c2d2d4f239 Mon Sep 17 00:00:00 2001 From: rhaesung Date: Wed, 22 Jan 2025 18:36:31 +0000 Subject: [PATCH 5/8] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 7f1a1d85d..93edbe115 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7f1a1d85d89f423edcef7c71775df3a8135e9242 +Subproject commit 93edbe1158ae57a63c64a2a40f5677fe7318ed81 From b4107db34d4af8602d4b197c5a4947e04cfb12d8 Mon Sep 17 00:00:00 2001 From: rhaesung Date: Wed, 22 Jan 2025 19:19:14 +0000 Subject: [PATCH 6/8] ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 93edbe115..3d828f59d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 93edbe1158ae57a63c64a2a40f5677fe7318ed81 +Subproject commit 3d828f59d86e19656046e6cf5423348bb233e3e5 From b20697f63c79de030ed7cace6a76c3c21660ffa4 Mon Sep 17 00:00:00 2001 From: rhaesung Date: Wed, 29 Jan 2025 17:35:25 +0000 Subject: [PATCH 7/8] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 3d828f59d..14d5e9c93 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3d828f59d86e19656046e6cf5423348bb233e3e5 +Subproject commit 14d5e9c93c7c454fd02c240f750e25d9d82fa0ff From 5bfbd53cd729b4fb4505c0048c3b1c2201eb884b Mon Sep 17 00:00:00 2001 From: rhaesung Date: Mon, 3 Feb 2025 17:11:28 +0000 Subject: [PATCH 8/8] revert change to .gitmodules and update submodule pointers for ccpp-physics --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index d7c02a1ed..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/rhaesung/ccpp-physics - branch = hr5 + 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 14d5e9c93..db19a6d1d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 14d5e9c93c7c454fd02c240f750e25d9d82fa0ff +Subproject commit db19a6d1d7fa7ed56f62318501c4abb5fb8b1138