merge

Merge branch 'master' of github.com:comp-physics/Carleman-QLBM

Author: xiang-yu

src/CLBM/CLBM_collision_test.jl

@@ -7,7 +7,11 @@ include(QCFD_SRC * "LBM/f_initial.jl")
 
 function CLBM_collision_test(Q, omega, f, C, truncation_order, dt, tau_value, e_value, n_time, l_plot)
 #---arbitrary initial condition
-    println("Single point CLBM collision test of the Forets and Pouly Carleman linearization")
+    if ngrid == 1
+        println("Single point CLBM collision test of the Forets and Pouly Carleman linearization")
+    else
+        println("Multi-grid CLBM collision test ($ngrid grid points) of the Forets and Pouly Carleman linearization")
+    end
     u0 = 0.1
     f_ini = f_ini_test(u0)
 
@@ -27,7 +31,11 @@ end
 
 function CLBM_collision_test_sparse(Q, omega, f, truncation_order, dt, tau_value, e_value, n_time, l_plot)
 #---arbitrary initial condition for sparse version
-    println("Single point CLBM collision test using SPARSE Carleman matrix implementation")
+    if ngrid == 1
+        println("Single point CLBM collision test using SPARSE Carleman matrix implementation")
+    else
+        println("Multi-grid CLBM collision test ($ngrid grid points) using SPARSE Carleman matrix implementation")
+    end
     u0 = 0.1
     f_ini = f_ini_test(u0)
 

src/CLBM/clbm_config.jl

@@ -3,7 +3,7 @@
 
 # Global simulation parameters
 global tau_value = 1.0
-global n_time = 10
+global n_time = 100
 global dt = tau_value / 10
 
 # Domain parameters  
@@ -17,7 +17,7 @@ global ngrid = 2
 # Sparse matrix computation control
 # true: Use sparse matrices (recommended for ngrid > 1)
 # false: Use dense matrices (only feasible for small problems)
-global use_sparse = false  # Testing dense mode
+global use_sparse = true # Testing dense mode
 
 # Helper function to get recommended sparse setting
 function get_recommended_sparse_setting(ngrid_val)

src/CLBM/clbm_run.jl

@@ -54,12 +54,14 @@ if use_sparse
 else
     println("Using DENSE Carleman matrix implementation (use_sparse=$use_sparse, ngrid=$ngrid)")
     C, bt, F0 = carleman_C(Q, truncation_order, poly_order, f, omega, tau_value, force_factor, w_value, e_value)
-    V = carleman_V(f, truncation_order)
     fT, VT_f, VT = CLBM_collision_test(Q, omega, f, C, truncation_order, dt, tau_value, e_value, n_time, l_plot)
 end
 
 title("CLBM-D1Q3, " * L"\tau=" *string(tau_value)  * L", u_0 = 0.1")
 
+# Ensure the plot is displayed
+show()
+
 lsavef = false
 
 if lsavef

src/CLBM/timeMarching.jl

@@ -49,7 +49,6 @@ function carleman_C_sparse(Q, truncation_order, poly_order, f, omega, tau_value,
     bt = spzeros(C_dim)
     bt[1:Q] = F0
 
-    # FIXED: Build sparse matrix with same overwrite behavior as dense version
     # Use a temporary dense matrix to handle overlaps correctly, then convert to sparse
     C_temp = zeros(C_dim, C_dim)
 
@@ -62,7 +61,6 @@ function carleman_C_sparse(Q, truncation_order, poly_order, f, omega, tau_value,
                 # Get the block matrix using sparse operations
                 A_block_sparse = carleman_transferA_sparse(ind_row, ind_col, Q, f, omega, tau_value, force_factor, w_value, e_value, F0, ngrid)
 
-                # FIXED: Use overwrite assignment (same as dense version) 
                 # This ensures later blocks overwrite earlier blocks in overlapping regions
                 C_temp[ind_row_C, ind_col_C] = Array(A_block_sparse)
             end