Debug code that will be deleted later.

Author: overfelt

components/omega/configs/Default.yml

@@ -32,7 +32,8 @@ Omega:
     Density0: 1026.0
     BottomDragTendencyEnable: false
     BottomDragCoeff: 0.0
-    TracerHorzAdvTendencyEnable: true
+    TracerHorzAdvTendencyEnable: false
+    TracerHighOrderHorzAdvTendencyEnable: true
     TracerDiffTendencyEnable: true
     EddyDiff2: 10.0
     TracerHyperDiffTendencyEnable: true

components/omega/src/ocn/OceanInit.cpp

@@ -28,6 +28,8 @@
 
 #include "mpi.h"
 
+#include <iostream>
+
 namespace OMEGA {
 
 int ocnInit(MPI_Comm Comm ///< [in] ocean MPI communicator
@@ -58,7 +60,9 @@ int ocnInit(MPI_Comm Comm ///< [in] ocean MPI communicator
 
 // Call init routines for remaining Omega modules
 int initOmegaModules(MPI_Comm Comm) {
-
+int MyTask=0;
+MPI_Comm_rank(Comm, &MyTask);
+std::cout<<__FILE__<<":"<<__LINE__<<":"<<MyTask<<std::endl;
    // error and return codes
    int Err = 0;
 
@@ -133,21 +137,25 @@ int initOmegaModules(MPI_Comm Comm) {
    int Err1 = IOStream::Success;
    int Err2 = IOStream::Success;
 
+std::cout<<__FILE__<<":"<<__LINE__<<":"<<MyTask<<std::endl;
    // read from initial state if this is starting a new simulation
    Metadata ReqMeta; // no requested metadata for initial state
    Err1 = IOStream::read("InitialState", ModelClock, ReqMeta);
 
+std::cout<<__FILE__<<":"<<__LINE__<<":"<<MyTask<<std::endl;
    // read restart if starting from restart
    SimTimeStr                = " ";
    ReqMeta["SimulationTime"] = SimTimeStr;
    Err2 = IOStream::read("RestartRead", ModelClock, ReqMeta);
 
+std::cout<<__FILE__<<":"<<__LINE__<<":"<<MyTask<<std::endl;
    // One of the above two streams must be successful to initialize the
    // state and other fields used in the model
    if (Err1 != IOStream::Success and Err2 != IOStream::Success) {
       ABORT_ERROR("Error initializing ocean variables from input streams");
    }
 
+std::cout<<__FILE__<<":"<<__LINE__<<":"<<MyTask<<std::endl;
    // If reading from restart, reset the current time to the input time
    if (SimTimeStr != " ") {
       TimeInstant NewCurrentTime(SimTimeStr);
@@ -178,6 +186,7 @@ int initOmegaModules(MPI_Comm Comm) {
       ABORT_ERROR("Error updating tracer device arrays after restart");
    }
 
+std::cout<<__FILE__<<":"<<__LINE__<<":"<<MyTask<<std::endl;
    return Err;
 
 } // end initOmegaModules

components/omega/src/ocn/Tendencies.cpp

@@ -13,6 +13,8 @@
 #include "Error.h"
 #include "Tracers.h"
 
+#include <iostream>
+
 namespace OMEGA {
 
 Tendencies *Tendencies::DefaultTendencies = nullptr;
@@ -165,11 +167,16 @@ void Tendencies::readTendConfig(
    if (TendConfig->existsVar("TracerHorzAdvTendencyEnable")) {
       TendConfig->get("TracerHorzAdvTendencyEnable",
                       this->TracerHorzAdv.Enabled);
-   } else if (TendConfig->existsVar("TracerHighOrderHorzAdvTendencyEnable")) {
+std::cout<<__FILE__<<":"<<__LINE__<<" Using TracerHorzAdvTendencyEnable:"<<this->TracerHorzAdv.Enabled<<std::endl;
+   }
+   if (TendConfig->existsVar("TracerHighOrderHorzAdvTendencyEnable")) {
       TendConfig->get("TracerHighOrderHorzAdvTendencyEnable",
                       this->TracerHighOrderHorzAdv.Enabled);
       this->TracerHighOrderHorzAdv.init();
-   } else {
+std::cout<<__FILE__<<":"<<__LINE__<<" Using TracerHighOrderHorzAdvTendencyEnable"<<this->TracerHighOrderHorzAdv.Enabled<<std::endl;
+   }
+   if (!TendConfig->existsVar("TracerHorzAdvTendencyEnable") && !TendConfig->existsVar("TracerHighOrderHorzAdvTendencyEnable")) {
+std::cout<<__FILE__<<":"<<__LINE__<<" Neigher TracerHorzAdvTendencyEnable nor TracerHighOrderHorzAdvTendencyEnable found"<<std::endl;
       Err += TendConfig->get("TracerHorzAdvTendencyEnable",
                              this->TracerHorzAdv.Enabled);
       Err += TendConfig->get("TracerHighOrderHorzAdvTendencyEnable",
@@ -178,6 +185,12 @@ void Tendencies::readTendConfig(
           Err, "Tendencies: Neither TracerHorzAdvTendencyEnable nor "
                "TracerHighOrderHorzAdvTendencyEnable found in TendConfig");
    }
+   if (this->TracerHorzAdv.Enabled && this->TracerHighOrderHorzAdv.Enabled) {
+      Err += Error(ErrorCode::Fail);
+      CHECK_ERROR_ABORT(
+          Err, "Tendencies: Both TracerHorzAdvTendencyEnable and "
+               "TracerHighOrderHorzAdvTendencyEnable set to true in TendConfig. Only one should be set to true.");
+   }
 
    Err += TendConfig->get("TracerDiffTendencyEnable",
                           this->TracerDiffusion.Enabled);