From a86b1ec6b097600521638f81be524a3ef4cc747c Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 25 Mar 2021 20:18:30 +0000 Subject: [PATCH 1/9] &gfs_physics_nml print_diff_pgr=.true. will print per-timestep pgr change stats --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index c4dff7856..7fb4c3082 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit c4dff78560fe86a5bf1495f4f24f782d90010acd +Subproject commit 7fb4c3082a5e41a2c6315624f4798035190d41ae From e03d7287b26b748de28d2dd9258773e9ab50b630 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 25 Mar 2021 20:29:46 +0000 Subject: [PATCH 2/9] point to sam's repository for FV3 and atmos_cubed_sphere --- .gitmodules | 4 ++-- FV3 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5524c9d29..a9ad3c1d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-GSL/fv3atm - branch = gsl/develop + url = https://github.com/SamuelTrahanNOAA/fv3atm + branch = feature/per-timestep-pgr-like-wrf [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 7fb4c3082..c19100b06 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 7fb4c3082a5e41a2c6315624f4798035190d41ae +Subproject commit c19100b0693767740a87b66db03790ffa072dc9a From 59de5e6428dd76c23e67852e2343ae69e76044fc Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 25 Mar 2021 21:34:13 +0000 Subject: [PATCH 3/9] Add units and lat/lon to per-timestep pgr stats --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index c19100b06..6f9299bb1 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit c19100b0693767740a87b66db03790ffa072dc9a +Subproject commit 6f9299bb1793ad0fe21f5266c6ad16cab6e96e49 From 2eb59c773e50fe13ad5906a97055b49fec281a51 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 25 Mar 2021 22:23:13 +0000 Subject: [PATCH 4/9] Rebase atmos_cubed_sphere to NOAA-GFDL dev/emc branch --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 6f9299bb1..1d47548f7 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 6f9299bb1793ad0fe21f5266c6ad16cab6e96e49 +Subproject commit 1d47548f7f779fb812a3c5882442788e9896dc37 From 40221b4eb062996c419de1e2cec3b7d4f95e7888 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 25 Mar 2021 23:05:33 +0000 Subject: [PATCH 5/9] Print mean pgr change as hPa/hr and other pgr data as bars. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 6f9299bb1..cd31df5fa 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 6f9299bb1793ad0fe21f5266c6ad16cab6e96e49 +Subproject commit cd31df5fa54b100dbb4057b264f7e9db4a4f30b0 From de799582bfdfa0a938f4d74d3e51f8f5b5523654 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Fri, 26 Mar 2021 16:32:07 +0000 Subject: [PATCH 6/9] Remove changes from atmos_cubed_sphere and simplify atmos_model.F90 changes. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index cd31df5fa..84c9f0b0d 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit cd31df5fa54b100dbb4057b264f7e9db4a4f30b0 +Subproject commit 84c9f0b0d7eae4916bea0546ffab8f15069eec1f From e93bd16d6cf53f14b8a7e0462225d63647b5edb4 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Fri, 26 Mar 2021 18:52:23 +0000 Subject: [PATCH 7/9] print mean abs change instead of mean change in pgr --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 84c9f0b0d..591edc017 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 84c9f0b0d7eae4916bea0546ffab8f15069eec1f +Subproject commit 591edc0179ffe05090dd46eef634773560999319 From abf59e45b2411baefc00b6ffb8d28143b63d9f83 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 1 Apr 2021 15:36:58 -0600 Subject: [PATCH 8/9] Turn on the printout of the WRF noise parameter for regression test fv3_gsd_diag3d_debug --- tests/default_vars.sh | 4 ++++ tests/parm/gsd.nml.IN | 1 + tests/tests/fv3_gsd_diag3d_debug | 2 ++ 3 files changed, 7 insertions(+) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index cba4c7488..22c0f774a 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -467,6 +467,10 @@ export IAU_DRYMASSFIXER=.false. # Regional export WRITE_RESTART_WITH_BCS=.false. +# Diagnostics +export PRINT_DIFF_PGR=.false. + +# Coupling export coupling_interval_fast_sec=0 } diff --git a/tests/parm/gsd.nml.IN b/tests/parm/gsd.nml.IN index df71eadb1..5d5699c81 100644 --- a/tests/parm/gsd.nml.IN +++ b/tests/parm/gsd.nml.IN @@ -208,6 +208,7 @@ do_gsl_drag_tofd = @[DO_GSL_DRAG_TOFD] do_ugwp_v1 = @[DO_UGWP_V1] do_ugwp_v1_orog_only = @[DO_UGWP_V1_OROG_ONLY] + print_diff_pgr = @[PRINT_DIFF_PGR] / &gfdl_cloud_microphysics_nml diff --git a/tests/tests/fv3_gsd_diag3d_debug b/tests/tests/fv3_gsd_diag3d_debug index 735e29552..161afb57a 100644 --- a/tests/tests/fv3_gsd_diag3d_debug +++ b/tests/tests/fv3_gsd_diag3d_debug @@ -99,5 +99,7 @@ export LSM=3 export LSOIL_LSM=9 export KICE=9 +export PRINT_DIFF_PGR=.true. + export WLCLK=30 From d1db3455e37b043b1a1b329240f33fc9749730cb Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Fri, 2 Apr 2021 14:09:01 +0000 Subject: [PATCH 9/9] Point FV3 to gsl/develop in NOAA-GSL/atm --- .gitmodules | 4 ++-- FV3 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a9ad3c1d9..5524c9d29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "FV3"] path = FV3 - url = https://github.com/SamuelTrahanNOAA/fv3atm - branch = feature/per-timestep-pgr-like-wrf + url = https://github.com/NOAA-GSL/fv3atm + branch = gsl/develop [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 837f7b4e9..6814d1ad9 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 837f7b4e9b9834f66a28579c7f427d978708a797 +Subproject commit 6814d1ad9cfca50a61eaede0a1b5a795eaa63305