EAMxx: default atm proc tendencies calculation to physics grid

Requires a bit more work to provide the ACTUAL name
of the physics grid to the atm process

Author: bartgol

components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/shell_commands

@@ -25,7 +25,7 @@ $atmchange -b physics::cosp::cosp_frequency=1
 $atmchange -b physics::mac_aero_mic::shoc::compute_tendencies=T_mid,qv
 $atmchange -b physics::mac_aero_mic::p3::compute_tendencies=T_mid,qv
 $atmchange -b physics::rrtmgp::compute_tendencies=T_mid
-$atmchange -b homme::compute_tendencies=T_mid,qv@physics_pg2,qc@physics_pg2
+$atmchange -b homme::compute_tendencies=T_mid,qv,qc
 
 # Set temperature cut off in dycore threshold to 180K
 $atmchange -b vtheta_thresh=180

components/eamxx/src/control/atmosphere_driver.cpp

@@ -589,7 +589,7 @@ void AtmosphereDriver::create_fields()
   }
 
   // Make atm procs create the proc-level tendency fields (if requested)
-  m_atm_process_group->setup_step_tendencies();
+  m_atm_process_group->setup_step_tendencies(m_grids_manager->get_grid("physics")->name());
 
   // Now that all processes have all the required/computed fields/groups, they
   // have also created any possible internal field (if needed). Notice that some

components/eamxx/src/share/atm_process/atmosphere_process.cpp

@@ -235,7 +235,7 @@ void AtmosphereProcess::finalize () {
 #endif
 }
 
-void AtmosphereProcess::setup_step_tendencies () {
+void AtmosphereProcess::setup_step_tendencies (const std::string& default_grid) {
   using strvec_t = std::vector<std::string>;
   auto tend_vec = m_params.get<strvec_t>("compute_tendencies",{});
   if (tend_vec.size()==0) {
@@ -253,7 +253,7 @@ void AtmosphereProcess::setup_step_tendencies () {
     EKAT_REQUIRE_MSG (tokens.size()==1 || tokens.size()==2,
         "Error! Invalid format for tendency calculation request: " + tn + "\n"
         "  To request tendencies for F, use 'F' or 'F@grid_name' format.\n");
-    return std::make_pair(tokens[0],tokens.size()==2 ? tokens[1] : "UNSET");
+    return std::make_pair(tokens[0],tokens.size()==2 ? tokens[1] : default_grid);
   };
 
 
@@ -262,7 +262,7 @@ void AtmosphereProcess::setup_step_tendencies () {
     auto fn = tokens.first;
     auto gn = tokens.second;
 
-    auto f = gn=="UNSET" ? get_field_out(fn) : get_field_out(fn,gn);
+    auto f = get_field_out(fn,gn);
 
     const auto& tname = this->name() + "_" + fn + "_tend";
 

components/eamxx/src/share/atm_process/atmosphere_process.hpp

@@ -128,7 +128,7 @@ class AtmosphereProcess : public std::enable_shared_from_this<AtmosphereProcess>
   // This method prepares the atm proc for computing the tendency of
   // output fields, as prescribed via parameter list
   // NOTE: virtual, as AtmProcGroup will override and just call it on stored procs
-  virtual void setup_step_tendencies ();
+  virtual void setup_step_tendencies (const std::string& default_grid);
 
   // Note: if we are being subcycled from the outside, the host will set
   //       do_update=false, and we will not update the timestamp of the AP

components/eamxx/src/share/atm_process/atmosphere_process_group.cpp

@@ -176,11 +176,12 @@ void AtmosphereProcessGroup::set_grids (const std::shared_ptr<const GridsManager
   m_grids_mgr = grids_manager;
 }
 
-void AtmosphereProcessGroup::setup_step_tendencies () {
+void AtmosphereProcessGroup::
+setup_step_tendencies (const std::string& default_grid) {
   for (const auto& atm_proc : m_atm_processes) {
-    atm_proc->setup_step_tendencies();
+    atm_proc->setup_step_tendencies(default_grid);
   }
-  AtmosphereProcess::setup_step_tendencies();
+  AtmosphereProcess::setup_step_tendencies(default_grid);
 }
 
 void AtmosphereProcessGroup::

components/eamxx/src/share/atm_process/atmosphere_process_group.hpp

@@ -46,7 +46,7 @@ class AtmosphereProcessGroup : public AtmosphereProcess
   void set_grids (const std::shared_ptr<const GridsManager> grids_manager);
 
   // Setup the tendencies requests for this group, as well as for all procs in the group
-  void setup_step_tendencies ();
+  void setup_step_tendencies (const std::string& default_grid);
 
   // --- Methods specific to AtmosphereProcessGroup --- //
   int get_num_processes () const { return m_atm_processes.size(); }