denote fields from IC properly and change blue color code

fixed minor bug--still an issue with 2 fields in p3 for pg2 cases

Author: mjschmidt271

components/eamxx/src/control/atmosphere_driver.cpp

@@ -245,12 +245,10 @@ void AtmosphereDriver::create_atm_processes()
   if (verb_lvl > 0) {
     // create an initial DAG with only atm_process nodes
     AtmProcDAG dag;
-
     // First, add all atm processes
     dag.init_atm_proc_nodes(*m_atm_process_group);
-
     // Write a dot file for visualization
-    dag.write_dag("dag_createAtmProcs-nodesOnly.dot", std::max(verb_lvl, 0));
+    dag.write_dag("createProc_dag.dot", std::max(verb_lvl, 0));
   }
 }
 
@@ -711,7 +709,7 @@ void AtmosphereDriver::create_fields()
     dag.create_dag(*m_atm_process_group);
 
     // Write a dot file for visualization
-    dag.write_dag("dag_createFields.dot",std::max(verb_lvl,0));
+    dag.write_dag("createField_dag.dot", std::max(verb_lvl,0));
   }
 
   m_ad_status |= s_fields_created;
@@ -902,15 +900,12 @@ initialize_fields ()
     // generate the full DAG, resolving any spurious unmet dependencies that
     // may be provided by initial conditions
     AtmProcDAG dag;
-
     // First, add all atm processes
     dag.create_dag(*m_atm_process_group);
-
     // process the initial conditions to maybe fulfill unmet dependencies
-    dag.process_initial_conditions(m_fields_inited);
-
+    dag.process_IC_alt(m_fields_inited);
     // Write a dot file for visualization
-    dag.write_dag("dag_init_fields-after_IC.dot",std::max(verb_lvl,0));
+    dag.write_dag("initField_dag.dot", std::max(verb_lvl,0));
   }
 
   // Initialize fields
@@ -1134,6 +1129,7 @@ void AtmosphereDriver::set_initial_conditions ()
                    grid_name == "Point Grid") {
           this_grid_topo_file_fnames.push_back("PHIS_d");
           this_grid_topo_eamxx_fnames.push_back(fname);
+          // FIXME:
           m_fields_inited[grid_name].push_back(fname);
         } else {
           EKAT_ERROR_MSG ("Error! Requesting phis on an unknown grid: " + grid_name + ".\n");
@@ -1146,7 +1142,7 @@ void AtmosphereDriver::set_initial_conditions ()
                         " topo file only has sgh30 for Physics PG2.\n");
         topography_file_fields_names[grid_name].push_back("SGH30");
         topography_eamxx_fields_names[grid_name].push_back(fname);
-	      m_fields_inited[grid_name].push_back(fname);
+        m_fields_inited[grid_name].push_back(fname);
       }
     } else if (not (fvphyshack and grid_name == "Physics PG2")) {
       // The IC file is written for the GLL grid, so we only load
@@ -1158,7 +1154,7 @@ void AtmosphereDriver::set_initial_conditions ()
         // If this field is the parent of other subfields, we only read from file the subfields.
         if (not ekat::contains(this_grid_ic_fnames,fname)) {
           this_grid_ic_fnames.push_back(fname);
-	        m_fields_inited[grid_name].push_back(fname);
+          m_fields_inited[grid_name].push_back(fname);
         }
       } else if (fvphyshack and grid_name == "Physics GLL") {
         // [CGLL ICs in pg2] I tried doing something like this in
@@ -1175,7 +1171,7 @@ void AtmosphereDriver::set_initial_conditions ()
           } else {
             this_grid_ic_fnames.push_back(fname);
           }
-	        m_fields_inited[grid_name].push_back(fname);
+          m_fields_inited[grid_name].push_back(fname);
         }
       }
     }
@@ -1239,17 +1235,21 @@ void AtmosphereDriver::set_initial_conditions ()
     // lat/lon data in topo file is defined in terms of PG2 grid,
     // so if we have a topo field on GLL grid, we need to setup
     // io info using the IC file (which is always GLL).
-    for (const auto& it : m_field_mgrs) {
-      const auto& grid_name = it.first;
+    for (const auto &it : m_field_mgrs) {
+      const auto &grid_name = it.first;
       if (ic_fields_names[grid_name].size() > 0 or
-	  topography_eamxx_fields_names[grid_name].size() > 0) {
-        const auto& file_name = grid_name == "Physics GLL"
-                                ?
-                                ic_pl.get<std::string>("Filename")
-                                :
-                                ic_pl.get<std::string>("topography_filename");
+          topography_eamxx_fields_names[grid_name].size() > 0) {
+        const auto &file_name =
+            grid_name == "Physics GLL"
+                ? ic_pl.get<std::string>("Filename")
+                : ic_pl.get<std::string>("topography_filename");
         m_iop->setup_io_info(file_name, it.second->get_grid());
       }
+      // // f_iop is std::map<std::string, Field>
+      // auto f_iop = m_iop->get_iop_field_map();
+      // for (const auto &f : f_iop) {
+      //   m_fields_inited[grid_name].push_back(f.first);
+      // }
     }
   }
 
@@ -1269,6 +1269,7 @@ void AtmosphereDriver::set_initial_conditions ()
                                              ic_fields_names[grid_name],
                                              m_current_ts,
                                              it.second);
+        // m_fields_inited[grid_name].push_back(ic_fields_names[grid_name]);
       }
     }
   }
@@ -1293,6 +1294,8 @@ void AtmosphereDriver::set_initial_conditions ()
     // Get the two fields, and copy src to tgt
     auto f_tgt = fm->get_field(tgt_fname);
     auto f_src = fm->get_field(src_fname);
+    // FIXME:
+    // m_fields_inited[gname].push_back(tgt_fname);
     f_tgt.deep_copy(f_src);
 
     // Set the initial time stamp
@@ -1348,6 +1351,10 @@ void AtmosphereDriver::set_initial_conditions ()
         read_fields_from_file (topography_file_fields_names[grid_name],
                                topography_eamxx_fields_names[grid_name],
                                io_grid,file_name,m_current_ts);
+        // auto &f_grid = topography_eamxx_fields_names[grid_name];
+        // for (const auto &f : f_grid) {
+        //   m_fields_inited[grid_name].push_back(f);
+        // }
       } else {
         // For IOP enabled, we load from file and copy data from the closest
         // lat/lon column to every other column
@@ -1356,6 +1363,7 @@ void AtmosphereDriver::set_initial_conditions ()
                                              topography_eamxx_fields_names[grid_name],
                                              m_current_ts,
                                              it.second);
+        // m_fields_inited[grid_name].push_back(topography_eamxx_fields_names[grid_name]);
       }
     }
     // Store in provenance list, for later usage in output file metadata
@@ -1526,6 +1534,8 @@ read_fields_from_file (const std::vector<std::string>& field_names,
   std::vector<Field> fields;
   for (const auto& fn : field_names) {
     fields.push_back(field_mgr->get_field(fn));
+    // // FIXME:
+    // m_fields_inited[grid->name()].push_back(fn);
   }
 
   AtmosphereInput ic_reader(file_name,grid,fields);
@@ -1643,6 +1653,21 @@ void AtmosphereDriver::initialize_atm_procs ()
   m_atm_logger->info("[EAMxx] initialize_atm_procs ... done!");
 
   report_res_dep_memory_footprint ();
+
+  auto& driver_options_pl = m_atm_params.sublist("driver_options");
+  const int verb_lvl = driver_options_pl.get<int>("atmosphere_dag_verbosity_level",-1);
+  if (verb_lvl>0) {
+    // now that we've got fields, generate a DAG with fields and dependencies
+    // NOTE: at this point, fields provided by initial conditions may (will)
+    // appear as unment dependencies
+    AtmProcDAG dag;
+    // First, add all atm processes
+    dag.create_dag(*m_atm_process_group);
+    // process the initial conditions to maybe fulfill unmet dependencies
+    dag.process_IC_alt(m_fields_inited);
+    // Write a dot file for visualization
+    dag.write_dag("initProc_dag.dot", std::max(verb_lvl,0));
+  }
 }
 
 void AtmosphereDriver::