fixup! Merge branch 's1056_branch' into mjs/eamxx/rework-DAG

Author: mjschmidt271

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

@@ -181,7 +181,7 @@ void AtmProcDAG::write_dag (const std::string& fname, const int verbosity) const
   ofile.open (fname.c_str());
 
   ofile << "strict digraph G {\n"
-        << "rankdir=\"LR\"";
+        << "rankdir=\"LR\"\n";
 
   for (const auto& n : m_nodes) {
     const auto& unmet = m_unmet_deps.at(n.id);
@@ -584,52 +584,6 @@ void AtmProcDAG::add_edges () {
 }
 
 void AtmProcDAG::process_initial_conditions(const grid_field_map &ic_inited) {
-  // return if there's nothing to do
-  if (ic_inited.size() == 0) {
-    return;
-  }
-  // Create a node for the ICs
-  int id = m_nodes.size();
-  m_nodes.push_back(Node());
-  Node& ic_node = m_nodes.back();
-  ic_node.id = id;
-  ic_node.name = "Initial Conditions";
-  m_unmet_deps[id].clear();
-  for (auto &node : m_nodes) {
-    if (m_unmet_deps.at(node.id).empty()) {
-      continue;
-    } else {
-      // NOTE: node_unmet_fields is a std::set<int>
-      auto &node_unmet_fields = m_unmet_deps.at(node.id);
-      // add the current node as a child of the IC node
-      ic_node.children.push_back(node.id);
-      for (auto um_fid : node_unmet_fields) {
-        for (auto &it1 : ic_inited) {
-          const auto &grid_name = it1.first;
-          // if this unmet-dependency field's name is in the ic_inited map for
-          // the provided grid_name key, then we flip its value negative and
-          // break from the for (ic_inited) and for (node_unmet_fields) loops;
-          // otherwise, keep trying for the next grid_name
-          if (ekat::contains(ic_inited.at(grid_name), m_fids[um_fid].name())) {
-            auto id_now_met = node_unmet_fields.extract(um_fid);
-            id_now_met.value() = -id_now_met.value();
-            node_unmet_fields.insert(std::move(id_now_met));
-            // add the fid of the formerly unmet dep to the initial condition
-            // node's computed list
-            ic_node.computed.insert(um_fid);
-            goto endloop;
-          } else {
-            continue;
-          }
-        }
-      endloop:;
-      }
-    }
-  }
-  m_IC_processed = true;
-}
-
-void AtmProcDAG::process_IC_alt(const grid_field_map &ic_inited) {
   // First, add the fields that were determined to come from the previous time
   // step => IC for t = 0
   // get the begin_node since the IC is identical at first

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

@@ -18,7 +18,6 @@ class AtmProcDAG {
 
   using grid_field_map = std::map<std::string,std::vector<std::string>>;
   void process_initial_conditions(const grid_field_map &ic_inited);
-  void process_IC_alt(const grid_field_map &ic_inited);
 
   void init_atm_proc_nodes(const group_type& atm_procs);