Merge branch 'bartgol/eamxx/avoid-full-rebuild-when-git-sha-changes' (PR #7589)

Avoid a full rebuild of eamxx when the git sha changes and cmake is triggered by make.

[BFB]

Author: bartgol

components/eamxx/CMakeLists.txt

@@ -589,11 +589,9 @@ if (NOT DEFINED ENV{SCREAM_FAKE_ONLY})
                  ${CMAKE_CURRENT_BINARY_DIR}/src/eamxx_config.h
                  F90_FILE ${CMAKE_CURRENT_BINARY_DIR}/src/eamxx_config.f)
 
-  # Generate eamxx_config.h and eamxx_config.f
-  include (EkatUtils)
-  EkatConfigFile(${CMAKE_CURRENT_SOURCE_DIR}/src/eamxx_config.h.in
-                 ${CMAKE_CURRENT_BINARY_DIR}/src/eamxx_config.h
-                 F90_FILE ${CMAKE_CURRENT_BINARY_DIR}/src/eamxx_config.f)
+  # Generate eamxx_version.h
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/eamxx_version.h.in
+                 ${CMAKE_CURRENT_BINARY_DIR}/src/eamxx_version.h)
 else()
   # This is a "fake" build of scream, to stress test the testing scripts.
   # We only need to build something in our tests folder

components/eamxx/src/control/atmosphere_driver.cpp

@@ -13,6 +13,7 @@
 #include "share/util/eamxx_utils.hpp"
 #include "share/io/eamxx_io_utils.hpp"
 #include "share/property_checks/mass_and_energy_conservation_check.hpp"
+#include "eamxx_version.h"
 
 #include <ekat_assert.hpp>
 #include <ekat_string_utils.hpp>

components/eamxx/src/eamxx_config.h.in

@@ -52,10 +52,4 @@
 // Whether or not small kernels are used in SHOC
 #cmakedefine SCREAM_SHOC_SMALL_KERNELS
 
-// The sha of the last commit
-#define EAMXX_GIT_VERSION "${EAMXX_GIT_VERSION}"
-
-// The version of EAMxx
-#define EAMXX_VERSION "${EAMXX_VERSION_MAJOR}.${EAMXX_VERSION_MINOR}.${EAMXX_VERSION_PATCH}"
-
 #endif

components/eamxx/src/eamxx_version.h.in

@@ -0,0 +1,10 @@
+#ifndef SCREAM_VERSION_H
+#define SCREAM_VERSION_H
+
+// The sha of the last commit
+#define EAMXX_GIT_VERSION "${EAMXX_GIT_VERSION}"
+
+// The version of EAMxx
+#define EAMXX_VERSION "${EAMXX_VERSION_MAJOR}.${EAMXX_VERSION_MINOR}.${EAMXX_VERSION_PATCH}"
+
+#endif

components/eamxx/src/share/eamxx_config.cpp

@@ -1,6 +1,7 @@
 #include "eamxx_config.hpp"
 #include "eamxx_session.hpp"
 #include "eamxx_types.hpp"
+#include "eamxx_version.h"
 
 #include <ekat_kokkos_session.hpp>
 #include <ekat_arch.hpp>
@@ -9,12 +10,20 @@
 
 namespace scream {
 
+std::string eamxx_version () {
+  return EAMXX_VERSION;
+}
+
+std::string eamxx_git_version () {
+  return EAMXX_GIT_VERSION;
+}
+
 std::string eamxx_config_string() {
   std::string config = "\n-------- EKAT CONFIGS --------\n\n";
   config += "Active AVX settings: " + ekat::active_avx_string () + "\n";
   config += "Compiler Id: " + ekat::compiler_id_string () + "\n";
   config += ekat::kokkos_config_string();
-  config += "\n-------- SCREAM CONFIGS --------\n\n";
+  config += "\n-------- EAMXX CONFIGS --------\n\n";
   config += " sizeof(Real) = " + std::to_string(sizeof(Real)) + "\n";
   config += " default pack size = " + std::to_string(SCREAM_PACK_SIZE) + "\n";
   config += " default FPE mask: " +

components/eamxx/src/share/eamxx_config.hpp

@@ -16,6 +16,9 @@
 
 namespace scream {
 
+std::string eamxx_version ();
+std::string eamxx_git_version ();
+
 std::string eamxx_config_string();
 
 // Utils to set/get whether leap year is used or not

components/eamxx/src/share/io/eamxx_output_manager.cpp

@@ -901,8 +901,8 @@ void OutputManager::set_file_header(const IOFileSpecs& file_specs)
 
   set_str_att("case",p.get<std::string>("caseid","NONE"));
   set_str_att("source","E3SM Atmosphere Model (EAMxx)");
-  set_str_att("eamxx_version",EAMXX_VERSION);
-  set_str_att("git_version",p.get<std::string>("git_version",EAMXX_GIT_VERSION));
+  set_str_att("eamxx_version",eamxx_version());
+  set_str_att("git_version",p.get<std::string>("git_version",eamxx_git_version()));
   set_str_att("hostname",p.get<std::string>("hostname","UNKNOWN"));
   set_str_att("username",p.get<std::string>("username","UNKNOWN"));
   set_str_att("atm_initial_conditions_file",p.get<std::string>("initial_conditions_file","NONE"));