From 241899b1d07b0677f85f7b19254a623f3b817003 Mon Sep 17 00:00:00 2001 From: noel Date: Thu, 27 Jun 2024 17:46:54 -0700 Subject: [PATCH 1/2] revert back to hex hash prints --- .../src/share/atm_process/atmosphere_process_hash.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp b/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp index 6b2f2fd080b..37cb251d779 100644 --- a/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp +++ b/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp @@ -129,9 +129,9 @@ ::print_global_state_hash (const std::string& label, const bool in, const bool o if (m_comm.am_i_root()) for (int i = 0; i < nslot; ++i) if (show[i]) - fprintf(stderr, "exxhash> %4d-%9.5f %1d %16lld (%s)\n", + fprintf(stderr, "exxhash> %4d-%9.5f %1d %16lx (%s)\n", timestamp().get_year(), timestamp().frac_of_year_in_days(), - i, (long long int)gaccum[i], label.c_str()); + i, gaccum[i], label.c_str()); } void AtmosphereProcess::print_fast_global_state_hash (const std::string& label) const { @@ -140,8 +140,8 @@ void AtmosphereProcess::print_fast_global_state_hash (const std::string& label) HashType gaccum; bfbhash::all_reduce_HashType(m_comm.mpi_comm(), &laccum, &gaccum, 1); if (m_comm.am_i_root()) - fprintf(stderr, "bfbhash> %14d %16lld (%s)\n", - timestamp().get_num_steps(), (long long int) gaccum, label.c_str()); + fprintf(stderr, "bfbhash> %14d %16lx (%s)\n", + timestamp().get_num_steps(), gaccum, label.c_str()); } } // namespace scream From c195b3c01f60922f5ff36fab65ec02560807a37f Mon Sep 17 00:00:00 2001 From: noel Date: Fri, 28 Jun 2024 11:51:26 -0700 Subject: [PATCH 2/2] use llx instead of lx for print format --- .../eamxx/src/share/atm_process/atmosphere_process_hash.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp b/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp index 37cb251d779..9fb5726084f 100644 --- a/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp +++ b/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp @@ -129,7 +129,7 @@ ::print_global_state_hash (const std::string& label, const bool in, const bool o if (m_comm.am_i_root()) for (int i = 0; i < nslot; ++i) if (show[i]) - fprintf(stderr, "exxhash> %4d-%9.5f %1d %16lx (%s)\n", + fprintf(stderr, "exxhash> %4d-%9.5f %1d %16llx (%s)\n", timestamp().get_year(), timestamp().frac_of_year_in_days(), i, gaccum[i], label.c_str()); } @@ -140,7 +140,7 @@ void AtmosphereProcess::print_fast_global_state_hash (const std::string& label) HashType gaccum; bfbhash::all_reduce_HashType(m_comm.mpi_comm(), &laccum, &gaccum, 1); if (m_comm.am_i_root()) - fprintf(stderr, "bfbhash> %14d %16lx (%s)\n", + fprintf(stderr, "bfbhash> %14d %16llx (%s)\n", timestamp().get_num_steps(), gaccum, label.c_str()); }