use merge dir in example

Author: philippwindischhofer

examples/dipole_ice/dipole_ice.cxx

@@ -27,7 +27,7 @@ int main(int argc, char* argv[]) {
 
   auto eps = [](scalar_t r, scalar_t z) {
 
-    return 1.0;
+    // return 1.0;
 
     scalar_t z_m = z / 3.0;    
     if(z_m > 0.0) {
@@ -58,14 +58,14 @@ int main(int argc, char* argv[]) {
 
   // CylinderGeometry geom(20, -15, 15, eps);
   // InfEDipoleAntenna dipole(0.0, 10.0, 0.0, impulse_response);
+  // scalar_t t_end = 25;
 
-  CylinderGeometry geom(70, -150, 150, eps);
-  InfEDipoleAntenna dipole(0.0, 10.0, 0.0, impulse_response);
-
+  CylinderGeometry geom(150, -150, 150, eps);
+  InfEDipoleAntenna dipole(0.0, 10.0, -30.0, impulse_response);
   scalar_t t_end = 150;
-  //scalar_t t_end = 25;
+  
   CylindricalWeightingFieldCalculator wfc(geom, dipole, t_end);
-  wfc.Calculate(wf_path);
+  wfc.Calculate(wf_path, "/scratch/midway3/windischhofer/eisvogel/");
 
   return 0;
 }

include/Eisvogel/CylindricalWeightingFieldCalculator.hh

@@ -13,7 +13,7 @@ class CylindricalWeightingFieldCalculator {
 public:
   CylindricalWeightingFieldCalculator(CylinderGeometry& geom, const Antenna& antenna, scalar_t t_end,
 				      double courant_factor = 0.5, double resolution = 12, double pml_width = 1.0);
-  void Calculate(std::filesystem::path outdir, std::filesystem::path tmpdir = "", std::filesystem::path mergedir = "");
+  void Calculate(std::filesystem::path outdir, std::filesystem::path mergedir = "", std::filesystem::path tmpdir = "");
 
 private:
 

src/CylindricalWeightingFieldCalculator.cxx

@@ -325,7 +325,7 @@ namespace meep {
 
 } // end namespace meep
 
-void CylindricalWeightingFieldCalculator::Calculate(std::filesystem::path outdir, std::filesystem::path tmpdir, std::filesystem::path mergedir) {
+void CylindricalWeightingFieldCalculator::Calculate(std::filesystem::path outdir, std::filesystem::path mergedir, std::filesystem::path tmpdir) {
 
   // Prepare merge directory
   if(mergedir.empty()) {
@@ -425,7 +425,7 @@ void CylindricalWeightingFieldCalculator::Calculate(std::filesystem::path outdir
   std::cout << "==============================================" << std::endl;
 
   if(meep::am_master()) {
-    std::shared_ptr<CylindricalWeightingField> cwf = std::make_shared<CylindricalWeightingField>(outdir, *m_start_coords, *m_end_coords);
+    std::shared_ptr<CylindricalWeightingField> cwf = std::make_shared<CylindricalWeightingField>(mergedir, *m_start_coords, *m_end_coords);
     cwf -> MakeMetadataPersistent();    
     cwf -> RebuildChunks(requested_chunk_size);