active film copy paste

Zitzeronion · Apr 10, 2024 · f38d600 · f38d600
1 parent 4a400b4
commit f38d600
Show file tree

Hide file tree

Showing 25 changed files with 5,073 additions and 1,732 deletions.
diff --git a/scripts/Active_thin_film.jl b/scripts/Active_thin_film.jl
diff --git a/scripts/Drop_coal.jl b/scripts/Drop_coal.jl
diff --git a/scripts/Moving_wettability.jl b/scripts/Moving_wettability.jl
@@ -219,7 +219,6 @@ v6 = [29404, 2940, 294]
 v7 = [34305, 3430, 343] 
 v8 = [39206, 3920, 392] 
 v9 = [44107, 4410, 441] 
-v10 = 2v5 
 # To pin down the Rayleigh-Plateu instability
 v_lam2_dia_more = [490, 245, 164, 123]
 for direction in ["diagonal"] #  "diagonal"
@@ -247,8 +246,6 @@ for direction in ["diagonal"] #  "diagonal"
             speeds .= v8
         elseif waves == 9
             speeds .= v9
-        elseif waves == 10
-            speeds .= v10
         end
         for speed in speeds # 1 2 3 # [0] 
             pattern = "sine"

diff --git a/src/Swalbe.jl b/src/Swalbe.jl
@@ -1,6 +1,7 @@
 module Swalbe
 # Coding
-using Revise, CUDA, Statistics, Random, Base, LazySets 
+using Revise, Statistics, Random, Base, LazySets, ThreadsX, LinearAlgebra, FFTW
+using CUDA
 # Datatypes and output
 using FileIO, JLD2, BSON, DataFrames
 
@@ -14,6 +15,7 @@ include("forcing.jl")
 include("moments.jl")
 include("simulate.jl")
 include("measures.jl")
-include("obstacle.jl")
+include("logic.jl")
+include("active.jl")
 
 end