next attempt

JuliaGeodynamics · Apr 21, 2024 · 7c9c866 · 7c9c866
1 parent 53a826c
commit 7c9c866
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/run_lamem.jl b/src/run_lamem.jl
@@ -42,7 +42,7 @@ julia> run_lamem(ParamFile, 2, "-nstep_max = 1")
 """
 function run_lamem(ParamFile::String, cores::Int64=1, args::String=""; wait=true, deactivate_multithreads=true)
     cores_compute = cores
-    if iswindows() & cores>1
+    if iswindows() && cores>1
         cores_compute=1;
         println("LaMEM_jll does not support parallel runs on windows; using 1 core instead")
     end

diff --git a/src/run_lamem_save_grid.jl b/src/run_lamem_save_grid.jl
@@ -7,7 +7,7 @@ using Base.Sys
 
 
 function run_lamem_with_log(ParamFile::String, cores::Int64=1, args::String=""; wait=true, deactivate_multithreads=true)
-    if iswindows() & cores>1
+    if iswindows() && cores>1
         cores=1;
         println("LaMEM_jll does not support parallel runs on windows; using 1 core instead")
     end
@@ -77,7 +77,7 @@ function run_lamem_save_grid(ParamFile::String, cores::Int64=1; verbose=true, di
 	if cores==1	& verbose==true
 		return print("No partitioning file required for 1 core model setup \n")	
 	end
-	if iswindows() & cores>1
+	if iswindows() && cores>1
         cores=1;
         println("LaMEM_jll does not support parallel runs on windows; using 1 core instead")
     end