Merge branch 'main' into dpstokes_open

Author: RaulPPelaez

.github/workflows/ci.yml

@@ -54,13 +54,6 @@ jobs:
         make html
       shell: micromamba-shell {0}
 
-    - name: Compile examples
-      run: |
-        mkdir examples/cpp/build && cd examples/cpp/build
-        cmake -DCMAKE_VERBOSE_MAKEFILE=yes -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX ..
-        make -j3
-      shell: micromamba-shell {0}
-      
     - name: Try to import libMobility
       run: |
         python -c "import libMobility"
@@ -73,7 +66,13 @@ jobs:
         #Only SelfMobility tests can run in the CPU
         pytest -sv -k SelfMobility tests/test*py
       shell: micromamba-shell {0}
-      
+
+    - name: Run examples
+      run: |
+        cd examples/
+        python example.py
+      shell: micromamba-shell {0}
+
     - name: Install via pip
       run: |
         pip install -vv .

environment.yml

@@ -5,7 +5,7 @@ channels:
 dependencies:
   - python <3.13
   - cmake >=3.24
-  - cuda-version<=13.1
+  - cuda-version <= 13.1
   - gxx >9,<15
   - cuda-libraries-dev
   - cuda-nvcc 

examples/python/README.md examples/README.mdexamples/python/README.md renamed to examples/README.md

@@ -56,6 +56,6 @@
 
 # Some solvers (e.g. SelfMobility) have no thermal drift and return all zeros.
 # In general, the thermal drift is non-zero and other solvers (e.g. DPStokes) return a non-zero value.
-linear_drift, _ = solver.thermalDrift()
+linear_drift, _ = solver.divM()
 print("Thermal drift:", linear_drift)
 solver.clean()

examples/cpp/CMakeLists.txt

@@ -23,16 +23,14 @@ std::string getPrecision();
 
 struct PyParameters {
   // The number of cells in each direction
-  // If -1, they will be autocomputed from the tolerance if possible (DP cannot
-  // do it, FCM can)
   int nx = -1;
   int ny = -1;
   int nz = -1;
   real viscosity;
   real Lx;
   real Ly;
   real zmin, zmax;
-  // Tolerance will be ignored in DP mode, TP will use only tolerance and nxy/nz
+  // Tolerance will be ignored in DP mode
   real tolerance = 1e-5;
   real delta = 1e-3; // RFD step size
   real w, w_d;