E3SM-Project / E3SM

Energy Exascale Earth System Model source code. NOTE: use "maint" branches for your work. Head of master is not validated.
https://docs.e3sm.org/E3SM
Other
353 stars 365 forks source link

Jgfouca/scream downstream 2024 11 07 #6739

Closed jgfouca closed 1 week ago

jgfouca commented 2 weeks ago

[BFB]

github-actions[bot] commented 2 weeks ago

PR Preview Action v1.4.8 :---: :rocket: Deployed preview to https://E3SM-Project.github.io/E3SM/pr-preview/pr-6739/ on branch gh-pages at 2024-11-09 19:44 UTC

mahf708 commented 1 week ago

Tests like SMS_Ln3.ne4pg2_oQU480.F2010-MMF2.chrysalis_intel fail due to an update in the p3 internals in eamxx; 067fa9301bd2598fc66e2db91391c2e883ef565b should hopefully fix the issue. That corresponds to PR https://github.com/E3SM-Project/PAM/pull/158:

From 1c37054d1ff9b160290cc286dcbd3cdc6cd7e7f6 Mon Sep 17 00:00:00 2001
From: Naser Mahfouz <naser.mahfouz@pnnl.gov>
Date: Sat, 9 Nov 2024 14:07:39 -0500
Subject: [PATCH] update p3 signature

---
 physics/scream_cxx_interfaces/scream_cxx_interface_p3.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/physics/scream_cxx_interfaces/scream_cxx_interface_p3.cpp b/physics/scream_cxx_interfaces/scream_cxx_interface_p3.cpp
index 8446403a..82d97636 100644
--- a/physics/scream_cxx_interfaces/scream_cxx_interface_p3.cpp
+++ b/physics/scream_cxx_interfaces/scream_cxx_interface_p3.cpp
@@ -240,16 +240,14 @@ namespace pam {

     p3_main_cxx_mutex.unlock();

-    // hardcode runtime options to match common scream settings for now
     P3F::P3Runtime runtime_options;
-    runtime_options.max_total_ni = 740.0e3;

     const int nlev_pack = ekat::npack<Spack>(nlev);
     const auto policy = ekat::ExeSpaceUtils<KT::ExeSpace>::get_default_team_policy(ncol, nlev_pack);
     ekat::WorkspaceManager<Spack, KT::Device> workspace_mgr(nlev_pack, 59, policy);

     auto elapsed_time = P3F::p3_main(runtime_options, prog_state, diag_inputs, diag_outputs, infrastructure,
-                                     history_only, lookup_tables, workspace_mgr, ncol, nlev, scream::physics::P3_Constants<Real>());
+                                     history_only, lookup_tables, workspace_mgr, ncol, nlev);
   }

 }