From 3eb86b56b3815f4965a02942bccbcf6ae4822ad0 Mon Sep 17 00:00:00 2001 From: zmoon Date: Wed, 5 Oct 2022 19:49:00 -0600 Subject: [PATCH 01/18] Update AQM to current noaa-oar-arl:develop head --- AQM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AQM b/AQM index d7916abff0..4bbaba2738 160000 --- a/AQM +++ b/AQM @@ -1 +1 @@ -Subproject commit d7916abff01fe44859c6ec307bafb2426ca3f632 +Subproject commit 4bbaba27383061ef03adf3901c753561f5a1d7d3 From 3237035f74e9c0f623f0d830f6b8b82b94584ef7 Mon Sep 17 00:00:00 2001 From: zmoon Date: Wed, 5 Oct 2022 19:55:20 -0600 Subject: [PATCH 02/18] Update AQM submodule URL --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 5ece87098e..35c20b291f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,5 +40,5 @@ branch = develop [submodule "AQM"] path = AQM - url = https://github.com/NOAA-EMC/AQM + url = https://github.com/noaa-oar-arl/AQM branch = develop From 1a043be2d48b6a3da31fb56994f59069c918c31c Mon Sep 17 00:00:00 2001 From: zmoon Date: Wed, 26 Oct 2022 11:06:43 -0600 Subject: [PATCH 03/18] Update AQM - build system updates from upstream - wet deposition fix from @rmontuoro --- AQM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AQM b/AQM index 4bbaba2738..71ebc0af93 160000 --- a/AQM +++ b/AQM @@ -1 +1 @@ -Subproject commit 4bbaba27383061ef03adf3901c753561f5a1d7d3 +Subproject commit 71ebc0af939319f97e9369e25961c2643461bcef From 6ed72ee4f66a390e032e82b4b50ffddbb69c80e0 Mon Sep 17 00:00:00 2001 From: zmoon Date: Thu, 17 Nov 2022 13:28:12 -0700 Subject: [PATCH 04/18] Update AQM now consistent with upstream develop AQM, but keeping the canopy changes --- AQM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AQM b/AQM index 71ebc0af93..173b7677b8 160000 --- a/AQM +++ b/AQM @@ -1 +1 @@ -Subproject commit 71ebc0af939319f97e9369e25961c2643461bcef +Subproject commit 173b7677b8e7773ecb95c31240e6a59979bc8a49 From 2ee12e68727ff87218a031bb793a5b37118bdb65 Mon Sep 17 00:00:00 2001 From: zmoon Date: Fri, 13 Jan 2023 11:24:39 -0700 Subject: [PATCH 05/18] Update AQM --- AQM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AQM b/AQM index 173b7677b8..14d6611992 160000 --- a/AQM +++ b/AQM @@ -1 +1 @@ -Subproject commit 173b7677b8e7773ecb95c31240e6a59979bc8a49 +Subproject commit 14d661199208d4b949bc590d468f45d25d9d4f72 From 30e033606b11171415a0141edc420e445fae5754 Mon Sep 17 00:00:00 2001 From: zmoon Date: Fri, 13 Jan 2023 15:55:44 -0700 Subject: [PATCH 06/18] Update AQM fixed 2 bugs introduced in the last upstream merge --- AQM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AQM b/AQM index 14d6611992..4861c202a9 160000 --- a/AQM +++ b/AQM @@ -1 +1 @@ -Subproject commit 14d661199208d4b949bc590d468f45d25d9d4f72 +Subproject commit 4861c202a9495bae65e8d2774942b8146277b9f0 From c29ad901b38e0da9b27f03782177a0bc21fbf1c8 Mon Sep 17 00:00:00 2001 From: zmoon Date: Thu, 19 Jan 2023 10:00:26 -0700 Subject: [PATCH 07/18] Update AQM cleanup/fix from last merge(s) --- AQM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AQM b/AQM index 4861c202a9..c7992a2325 160000 --- a/AQM +++ b/AQM @@ -1 +1 @@ -Subproject commit 4861c202a9495bae65e8d2774942b8146277b9f0 +Subproject commit c7992a2325d0e1bd650e0297b437cbb310d78634 From 1132b5d486db5bf6a55edd44079f3e34cfb5732e Mon Sep 17 00:00:00 2001 From: zmoon Date: Fri, 10 Feb 2023 15:04:47 -0700 Subject: [PATCH 08/18] Update AQM --- AQM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AQM b/AQM index c7992a2325..5fd4b743be 160000 --- a/AQM +++ b/AQM @@ -1 +1 @@ -Subproject commit c7992a2325d0e1bd650e0297b437cbb310d78634 +Subproject commit 5fd4b743bef4ca7b937bda8d02fe81119976520c From 0376aed13accd957229ce9a12e3f4f63785eb8e2 Mon Sep 17 00:00:00 2001 From: drnimbusrain Date: Sat, 11 Feb 2023 17:09:25 -0500 Subject: [PATCH 09/18] Updated .gitmodules for fv3atm to noaa-oar-arl fork. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9718246ed4..21c0572a37 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm + url = https://github.com/noaa-oar-arl/fv3atm branch = develop [submodule "WW3"] path = WW3 From aada713af008a2ca3da8ee087956593a2a2678e1 Mon Sep 17 00:00:00 2001 From: drnimbusrain Date: Sat, 11 Feb 2023 17:10:42 -0500 Subject: [PATCH 10/18] Updated FV3 submodule --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 0e8f580aed..625989afe6 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0e8f580aed624e2c5d46b039107e31c9c64ae013 +Subproject commit 625989afe6a99e6d78a21b8dcd578a05033039b1 From 27fdc5c6856199fd48ace475a6da5f7631357489 Mon Sep 17 00:00:00 2001 From: drnimbusrain Date: Sat, 11 Feb 2023 17:19:30 -0500 Subject: [PATCH 11/18] Updated submodules. --- CMakeModules | 2 +- GOCART | 2 +- NOAHMP-interface/noahmp | 2 +- stochastic_physics | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeModules b/CMakeModules index cedeb2c64e..cabd7753ae 160000 --- a/CMakeModules +++ b/CMakeModules @@ -1 +1 @@ -Subproject commit cedeb2c64e55d3445ac4e4847ea7c4fa3220c3dd +Subproject commit cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 diff --git a/GOCART b/GOCART index b94145fca4..acc574ff8e 160000 --- a/GOCART +++ b/GOCART @@ -1 +1 @@ -Subproject commit b94145fca46169bbc53ec6b8d4ed849715dc5130 +Subproject commit acc574ff8e651deebcc10c0fca5d23e03f2aab79 diff --git a/NOAHMP-interface/noahmp b/NOAHMP-interface/noahmp index 9c8a1c0964..a0157e53c5 160000 --- a/NOAHMP-interface/noahmp +++ b/NOAHMP-interface/noahmp @@ -1 +1 @@ -Subproject commit 9c8a1c0964b08491320221d45b80574f42a46d66 +Subproject commit a0157e53c54454ea3638d8fd856cc499c9c29ec5 diff --git a/stochastic_physics b/stochastic_physics index 3bfa4468d8..9e5c1b2a40 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit 3bfa4468d85e5b63980c28434f494967f38b10a3 +Subproject commit 9e5c1b2a40ff468d85c7e9baa3eca1e610ea6d9c From 2e9fbd117397b8e2ef9fadf73a6e86be7fb033b0 Mon Sep 17 00:00:00 2001 From: zmoon Date: Tue, 7 Mar 2023 14:39:45 -0700 Subject: [PATCH 12/18] Revert "Updated submodules." This reverts commit 27fdc5c6856199fd48ace475a6da5f7631357489. For our develop branch, we should try to stay closer to upstream --- CMakeModules | 2 +- GOCART | 2 +- NOAHMP-interface/noahmp | 2 +- stochastic_physics | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeModules b/CMakeModules index cabd7753ae..cedeb2c64e 160000 --- a/CMakeModules +++ b/CMakeModules @@ -1 +1 @@ -Subproject commit cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 +Subproject commit cedeb2c64e55d3445ac4e4847ea7c4fa3220c3dd diff --git a/GOCART b/GOCART index acc574ff8e..b94145fca4 160000 --- a/GOCART +++ b/GOCART @@ -1 +1 @@ -Subproject commit acc574ff8e651deebcc10c0fca5d23e03f2aab79 +Subproject commit b94145fca46169bbc53ec6b8d4ed849715dc5130 diff --git a/NOAHMP-interface/noahmp b/NOAHMP-interface/noahmp index a0157e53c5..9c8a1c0964 160000 --- a/NOAHMP-interface/noahmp +++ b/NOAHMP-interface/noahmp @@ -1 +1 @@ -Subproject commit a0157e53c54454ea3638d8fd856cc499c9c29ec5 +Subproject commit 9c8a1c0964b08491320221d45b80574f42a46d66 diff --git a/stochastic_physics b/stochastic_physics index 9e5c1b2a40..3bfa4468d8 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit 9e5c1b2a40ff468d85c7e9baa3eca1e610ea6d9c +Subproject commit 3bfa4468d85e5b63980c28434f494967f38b10a3 From d5473d28c9e36b7ffd09199255ad2c92a2f35601 Mon Sep 17 00:00:00 2001 From: zmoon Date: Tue, 7 Mar 2023 14:43:26 -0700 Subject: [PATCH 13/18] Update FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 625989afe6..25aa1c6218 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 625989afe6a99e6d78a21b8dcd578a05033039b1 +Subproject commit 25aa1c62187da1a7109ecd95d6b52f898a796fdb From a3cff561d1b3653c8ef44beaf37fdb0735c3964d Mon Sep 17 00:00:00 2001 From: drnimbusrain Date: Thu, 16 Mar 2023 13:35:36 -0400 Subject: [PATCH 14/18] Adding default ufs_hopper.gnu.lua build file. --- modulefiles/ufs_hopper.gnu.lua | 44 ++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 modulefiles/ufs_hopper.gnu.lua diff --git a/modulefiles/ufs_hopper.gnu.lua b/modulefiles/ufs_hopper.gnu.lua new file mode 100644 index 0000000000..92f0f4f675 --- /dev/null +++ b/modulefiles/ufs_hopper.gnu.lua @@ -0,0 +1,44 @@ +help([[ +loads UFS Model prerequisites for Hopper/GNU +]]) + +-- This path should point to your HPCstack installation directory +local HPCstack="/opt/sw/other/apps/hpc-stack/" + +-- prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles") +-- Load HPC stack +prepend_path("MODULEPATH", pathJoin(HPCstack, "modulefiles/stack")) + +-- miniconda3_ver=os.getenv("miniconda3_ver") or "3.7.3" +-- load(pathJoin("miniconda3", miniconda3_ver)) + +-- prepend_path("MODULEPATH", "/contrib/sutils/modulefiles") +-- load("sutils") + +-- cmake_ver=os.getenv("cmake_ver") or "3.20.1" +-- cmake_ver=os.getenv("cmake_ver") or "3.22.1-6o" +-- load(pathJoin("cmake", cmake_ver)) + +-- gnu_ver=os.getenv("gnu_ver") or "9.2.0" +-- load(pathJoin("gnu", gnu_ver)) + +-- prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/gnu-9.2/modulefiles/stack") + +-- hpc_ver=os.getenv("hpc_ver") or "1.2.0" +-- load(pathJoin("hpc", hpc_ver)) + +-- hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "9.2" +-- load(pathJoin("hpc-gnu", hpc_gnu_ver)) + +-- hpc_mpich_ver=os.getenv("hpc_mpich_ver") or "3.3.2" +-- hpc_mpich_ver=os.getenv("hpc_mpich_ver") or "hpc-mpich" +-- load(pathJoin("hpc-mpich", hpc_mpich_ver)) + +-- load("ufs_common") + +setenv("CC", "mpicc") +setenv("CXX", "mpicxx") +setenv("FC", "mpif90") +setenv("CMAKE_Platform", "hera.gnu") + +whatis("Description: UFS build environment") From 99216aa4f46a233ebe8d1fbd6647ac10df9417b2 Mon Sep 17 00:00:00 2001 From: zmoon Date: Fri, 24 Mar 2023 17:18:10 -0600 Subject: [PATCH 15/18] Update AQM --- AQM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AQM b/AQM index 5fd4b743be..795948c331 160000 --- a/AQM +++ b/AQM @@ -1 +1 @@ -Subproject commit 5fd4b743bef4ca7b937bda8d02fe81119976520c +Subproject commit 795948c33180119e435e57fb42382accc0ee5c8f From d3f819b76b97342e0b40ab6e83c82d5ec9e67daf Mon Sep 17 00:00:00 2001 From: zmoon Date: Fri, 7 Jul 2023 14:07:30 -0600 Subject: [PATCH 16/18] Update FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 01e1e480e2..35287a3c94 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 01e1e480e2b2dd113f25113b9866bf4f1ad5d31e +Subproject commit 35287a3c946343358929cae493c06de036b3c2ae From 946a4fdaaa232f19fa878d9c233e7c1c16a5c03a Mon Sep 17 00:00:00 2001 From: drnimbusrain Date: Fri, 28 Feb 2025 18:01:57 +0000 Subject: [PATCH 17/18] Commit of only canopy changes in tests/parm/fd_ufs.yaml. --- AQM | 2 +- FV3 | 2 +- tests/parm/fd_ufs.yaml | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/AQM b/AQM index 795948c331..37cbb7d684 160000 --- a/AQM +++ b/AQM @@ -1 +1 @@ -Subproject commit 795948c33180119e435e57fb42382accc0ee5c8f +Subproject commit 37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 diff --git a/FV3 b/FV3 index 9ba987d1f8..5132aa6d82 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 9ba987d1f81fcd38ec161db20989034318f8ea42 +Subproject commit 5132aa6d8295167306c8c07799fda9008ce1b20e diff --git a/tests/parm/fd_ufs.yaml b/tests/parm/fd_ufs.yaml index 6e089f8bea..041122408c 100644 --- a/tests/parm/fd_ufs.yaml +++ b/tests/parm/fd_ufs.yaml @@ -1236,6 +1236,39 @@ field_dictionary: canonical_units: 1 description: AOD # + # IVAI + - standard_name: inst_tracer_diag_claie + canonical_units: 1 + description: CLAIE + # + - standard_name: inst_tracer_diag_cfch + canonical_units: m + description: CFCH + # + - standard_name: inst_tracer_diag_cfrt + canonical_units: 1 + description: CFRT + # + - standard_name: inst_tracer_diag_cclu + canonical_units: 1 + description: CCLU + # + - standard_name: inst_tracer_diag_cpopu + canonical_units: people km-2 + description: CPOPU + # + - standard_name: inst_tracer_diag_coszens + canonical_units: 1 + description: COSZENS + # + - standard_name: inst_tracer_diag_jo3o1d + canonical_units: min-1 + description: JO3O1D + # + - standard_name: inst_tracer_diag_jno2 + canonical_units: min-1 + description: JNO2 + # IVAI - standard_name: Sl_sfrac alias: inst_snow_area_fraction_lnd canonical_units: 1 From 1b534c7c6bac8b02d99db79fc2be5d600ed07665 Mon Sep 17 00:00:00 2001 From: drnimbusrain Date: Fri, 28 Feb 2025 18:05:05 +0000 Subject: [PATCH 18/18] Reverting .gitmodules and cleaning. --- .gitmodules | 4 ++-- modulefiles/ufs_hopper.gnu.lua | 44 ---------------------------------- 2 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 modulefiles/ufs_hopper.gnu.lua diff --git a/.gitmodules b/.gitmodules index 0504ee2046..ab72b60a64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "FV3"] path = FV3 - url = https://github.com/noaa-oar-arl/fv3atm + url = https://github.com/NOAA-EMC/fv3atm branch = develop [submodule "WW3"] path = WW3 @@ -40,7 +40,7 @@ branch = develop [submodule "AQM"] path = AQM - url = https://github.com/noaa-oar-arl/AQM + url = https://github.com/NOAA-EMC/AQM branch = develop [submodule "NOAHMP"] path = NOAHMP-interface/noahmp diff --git a/modulefiles/ufs_hopper.gnu.lua b/modulefiles/ufs_hopper.gnu.lua deleted file mode 100644 index 92f0f4f675..0000000000 --- a/modulefiles/ufs_hopper.gnu.lua +++ /dev/null @@ -1,44 +0,0 @@ -help([[ -loads UFS Model prerequisites for Hopper/GNU -]]) - --- This path should point to your HPCstack installation directory -local HPCstack="/opt/sw/other/apps/hpc-stack/" - --- prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles") --- Load HPC stack -prepend_path("MODULEPATH", pathJoin(HPCstack, "modulefiles/stack")) - --- miniconda3_ver=os.getenv("miniconda3_ver") or "3.7.3" --- load(pathJoin("miniconda3", miniconda3_ver)) - --- prepend_path("MODULEPATH", "/contrib/sutils/modulefiles") --- load("sutils") - --- cmake_ver=os.getenv("cmake_ver") or "3.20.1" --- cmake_ver=os.getenv("cmake_ver") or "3.22.1-6o" --- load(pathJoin("cmake", cmake_ver)) - --- gnu_ver=os.getenv("gnu_ver") or "9.2.0" --- load(pathJoin("gnu", gnu_ver)) - --- prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/gnu-9.2/modulefiles/stack") - --- hpc_ver=os.getenv("hpc_ver") or "1.2.0" --- load(pathJoin("hpc", hpc_ver)) - --- hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "9.2" --- load(pathJoin("hpc-gnu", hpc_gnu_ver)) - --- hpc_mpich_ver=os.getenv("hpc_mpich_ver") or "3.3.2" --- hpc_mpich_ver=os.getenv("hpc_mpich_ver") or "hpc-mpich" --- load(pathJoin("hpc-mpich", hpc_mpich_ver)) - --- load("ufs_common") - -setenv("CC", "mpicc") -setenv("CXX", "mpicxx") -setenv("FC", "mpif90") -setenv("CMAKE_Platform", "hera.gnu") - -whatis("Description: UFS build environment")