final changes to model implementations

Author: francosansone

test/partitioner/external_tools/graph_partitioner.cpp

@@ -162,7 +162,8 @@ std::tuple<Partition, std::chrono::duration<double>> GraphPartitioner::createPar
   auto end = std::chrono::high_resolution_clock::now();
   std::chrono::duration<double> duration = end - start;
 
-  std::cout << "Partition Time: " << duration.count() << " seconds." << std::endl;
+  std::cout << "Partition Time: " << std::chrono::duration_cast<std::chrono::milliseconds>(duration).count() << " miliseconds."
+            << std::endl;
 
   if (save_to_file) {
     const std::string fileName =
@@ -517,13 +518,13 @@ void GraphPartitioner::readGraphFromSBG()
   _edges = grp_t(_adjncy.size());
 
   // @todo: Add logging, for the moment just comment the code.
-  for (int i = 0; i < _nbr_vtxs; ++i) {
+  /*for (int i = 0; i < _nbr_vtxs; ++i) {
     std::cout << "Node " << i << " Connections: ";
     for (int j = _xadj[i]; j < _xadj[i + 1]; ++j) {
       std::cout << _adjncy[j] << " ";
     }
     std::cout << std::endl;
-  }
+  }*/
 
   // @todo: Read weights files.
   _vwgt.resize(_nbr_vtxs, 1);

test/partitioner/sim_models/advection_2D/advection2D.mo

@@ -38,19 +38,19 @@ model advection2D
 	    end for;
 	annotation(
     experiment(
-        MMO_Description = "Advection",
-        MMO_Solver = QSS3,
+        MMO_Description = " Advection",
+        MMO_Solver = LIQSS2,
+        MMO_Parallel = true,
         MMO_PartitionMethod = Manual,
+        MMO_LPS = 12,
         MMO_DT_Min = 1,
         Jacobian = Dense,
         MMO_BDF_PDepth = 1,
         MMO_BDF_Max_Step = 0,
         StartTime = 0.0,
-        StopTime = 10,
+        StopTime = 300,
         Tolerance = {1e-3},
-        AbsTolerance = {1e-3},
-        MMO_LPS = 8,
-        MMO_Parallel = true
+        AbsTolerance = {1e-3}
     )
 );
 
@@ -92,43 +92,6 @@ model advection2D
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 

test/partitioner/sim_models/airconds_cont/sections.c

@@ -1,6 +1,6 @@
-int 
-getSection(int i)
+int getSection(int i)
 {
- int ret = ((i-1)/1000)+1;
+  int partition_size = 1000;
+  int ret = ((i - 1) / partition_size) + 1;
   return (ret);
 }

test/partitioner/sim_models/sim_models.py

@@ -192,6 +192,41 @@ def extract_size_from_partition(partition_name):
         )
 
 
+def generate_sections_file(size, partitions, destination):
+    """
+    Generates the C file and copies it to the specified build directory.
+    """
+    filename = "sections.c"
+    partition_size = size // partitions
+    
+    c_code = f"""int 
+getSection(int i)
+{{
+    int partition_size = {partition_size};
+    int ret = ((i - 1) / partition_size) + 1;
+    return (ret);
+}}
+"""
+    try:
+        # 1. Write the file
+        with open(filename, "w") as f:
+            f.write(c_code)
+        print(f"Successfully generated '{filename}' with partition_size {partition_size}.")
+        
+        # 2. Copy the file to the destination
+        if not os.path.exists(destination):
+            print(f"Error: Destination directory '{destination}' does not exist.")
+            return
+
+        shutil.copy(filename, destination)
+        print(f"Successfully copied '{filename}' to '{destination}'.")
+        
+    except IOError as e:
+        print(f"An error occurred during file operations: {e}")
+    except PermissionError:
+        print(f"Permission denied: Unable to write to '{destination}'.")
+
+
 def execute_simulation(model_path, partition_name):
     """
     Compiles and executes the model dynamically, assigning N size constraints first.
@@ -200,6 +235,7 @@ def execute_simulation(model_path, partition_name):
 
     model_p = Path(model_path).resolve()
     model_file = str(model_p)
+    model = file_handlers.get_file_name(model_file)
 
     partition_p = Path(partition_name).resolve()
 
@@ -209,11 +245,15 @@ def execute_simulation(model_path, partition_name):
 
     # Derive target destination (<model_name>.part in the model's directory)
     target_partition_path = model_p.with_suffix('.part')
-    
+    build_target_path = new_path = Path(os.environ['MMOC_BUILD']) / model
+    print("BUILD TARGET")
+    print(build_target_path)
+
     # Step 1: Copy custom partition to the required solver location
     try:
         print(f"Copying partition: {partition_p.name} -> {target_partition_path}")
         shutil.copy2(Path(partition_name).resolve(), target_partition_path)
+        shutil.copy2(target_partition_path, build_target_path)
     except Exception as e:
         print(f"Failed to copy partition file: {e}")
         return False
@@ -225,8 +265,9 @@ def execute_simulation(model_path, partition_name):
         print(f"Current structural Constants: {current_constants}")
 
         # Updating constant N size property
-        set_constants(model_file, {"N": size})
+        set_constants(model_file, {"N": size, "SECTIONS" : parts})
         print(f"Successfully set Constant 'N' to: {size}")
+        print(f"Successfully set Constant 'SECTIONS' to: {parts}")
 
     except Exception as e:
         print(f"Failed handling structural setup attributes: {e}")
@@ -247,7 +288,10 @@ def execute_simulation(model_path, partition_name):
             print(f"  {key}: {value}")
     else:
         print("  No annotations found")
-    
+
+    if model == "airconds_cont":
+        generate_sections_file(size, parts, build_target_path)
+
     # Step 3: Compile the model
     print(f"\nCompiling model: {model_file}")
     if compile_model(model_file):
@@ -265,7 +309,6 @@ def execute_simulation(model_path, partition_name):
         return False
 
     # Step 5: Get simulation results
-    model = file_handlers.get_file_name(model_file)
     model_log_path = file_handlers.get_full_path(model, 'MMOC_LOG')    
     sim_results(model_log_path)
     process_model_logs(file_handlers.get_base_path(model_log_path, 'MMOC_LOG'), model, sim_results)    
@@ -306,4 +349,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()