Sensei2 ghost libsim

Jacobi/Sensei/C/Bridge.cxx

@@ -21,29 +21,26 @@ namespace BridgeInternals
 }
 
 //-----------------------------------------------------------------------------
-void bridge_initialize(MPI_Comm comm,
-  int m, int rankx, int ranky, int bx, int by, int ng,
-  const char* config_file)
+void bridge_initialize(MPI_Comm comm, simulation_data *sim, const char *config_file)
 {
   BridgeInternals::comm = comm;
 
   // initialize the data adaptor
   BridgeInternals::GlobalDataAdaptor =
     vtkSmartPointer<pjacobi::JacobiDataAdaptor>::New();
 
-  BridgeInternals::GlobalDataAdaptor->Initialize(m, rankx, ranky, bx, by, ng);
+  BridgeInternals::GlobalDataAdaptor->Initialize(sim);
 
   // initialize the analysis adaptor
   BridgeInternals::GlobalAnalysisAdaptor = vtkSmartPointer<sensei::ConfigurableAnalysis>::New();
   BridgeInternals::GlobalAnalysisAdaptor->Initialize(comm, config_file);
 }
 
 //-----------------------------------------------------------------------------
-void bridge_update(int tstep, double time, double* temperature)
+void bridge_update(simulation_data *sim)
 {
-  BridgeInternals::GlobalDataAdaptor->SetDataTime(time);
-  BridgeInternals::GlobalDataAdaptor->SetDataTimeStep(tstep);
-  BridgeInternals::GlobalDataAdaptor->AddArray("temperature", temperature);
+  BridgeInternals::GlobalDataAdaptor->Update(sim);
+
   if (!BridgeInternals::GlobalAnalysisAdaptor->Execute(BridgeInternals::GlobalDataAdaptor))
     {
     cerr << "ERROR: Failed to execute the analysis" << endl;

Jacobi/Sensei/C/Bridge.h

@@ -3,22 +3,21 @@
 
 #include <mpi.h>
 #include <stdint.h>
+#include <solvers.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
   /// This defines the analysis bridge for the pjacobi miniapp.
 
   /// Called before simulation loop
-  void bridge_initialize(MPI_Comm comm,
-    int m, int rankx, int ranky, int bx, int by, int ng,
-    const char* config_file);
+  void bridge_initialize(MPI_Comm comm, simulation_data *sim, const char *config);
 
   /// Called per timestep in the simulation loop
-  void bridge_update(int tstep, double time, double* temperature);
+  void bridge_update(simulation_data *sim);
 
   /// Called just before simulation terminates.
-  void bridge_finalize();
+  void bridge_finalize(void);
 
 #ifdef __cplusplus
 } // extern "C"

Jacobi/Sensei/C/jacobi_sensei_2.xml

@@ -10,12 +10,13 @@
 
   <!-- CATALYST -->
   <analysis type="catalyst" pipeline="pythonscript"
-    filename="jacobi_catalyst_sensei_2.py" enabled="1" />
+    filename="jacobi_catalyst_sensei_2.py" enabled="0" />
 
   <!-- LIBSIM -->
-  <analysis type="libsim" plots="Pseudocolor,Mesh" plotvars="temperature,mesh"
+  <analysis type="libsim" visitdir="/Users/bjw/Development/MAIN/trunk/install" mode="interactive,paused" options="-debug 5 -clobber_vlogs" trace="trace"
+    plots="Pseudocolor,Mesh" plotvars="temperature,mesh" 
     image-filename="jacobi_%ts" image-width="800" image-height="800"
-    slice-project="1" image-format="png" enabled="0"/>
+    slice-project="1" image-format="png" enabled="1"/>
 
   <!-- ADIOS -->
   <analysis type="adios" filename="jacobi.bp" method="MPI" enabled="0" />

Jacobi/Sensei/C/pjacobi.c

@@ -53,16 +53,15 @@ int main(int argc, char *argv[])
 
   const char *config = argv[1];
 
-  bridge_initialize(MPI_COMM_WORLD, sim.m,
-    sim.rankx, sim.ranky, sim.bx, sim.by, 1, config);
+  bridge_initialize(MPI_COMM_WORLD, &sim, config);
 #endif
 
 
   while ((sim.gdel > TOL) && (sim.iter <= MAXSTEPS))
     {  // iterate until error below threshold
     simulate_one_timestep(&sim);
 #ifdef ENABLE_SENSEI
-   bridge_update(sim.iter, sim.iter*1.0, sim.Temp);
+   bridge_update(&sim);
 #endif
     }