Skip to content

Commit

Permalink
update function names to reflect updated packages
Browse files Browse the repository at this point in the history
  • Loading branch information
boriskaus committed Aug 26, 2024
1 parent 3afbf80 commit 042f0bd
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions test/t12_Temperature_diffusion/Temp_setup.jl
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ function CreateMarkers_Temperature(dir="./", ParamFile="t12_Temperature_diffusio
# Save LaMEM markers
if NumberCores==1
# 1 core
Save_LaMEMMarkersParallel(Model3D, directory=dir_markers, verbose=false) # Create LaMEM marker input on 1 core
save_LaMEM_markers_parallel(Model3D, directory=dir_markers, verbose=false) # Create LaMEM marker input on 1 core
else
#> 1 cores; create partitioning file first
PartFile = CreatePartitioningFile(ParamFile,NumberCores, LaMEM_dir="../../bin/opt/");
Save_LaMEMMarkersParallel(Model3D, PartitioningFile=PartFile, directory=dir_markers, verbose=false, is64bit=is64bit)
save_LaMEM_markers_parallel(Model3D, PartitioningFile=PartFile, directory=dir_markers, verbose=false, is64bit=is64bit)
end

cd(cur_dir)
Expand Down
2 changes: 1 addition & 1 deletion test/t13_Rheology0D/Rheology0D.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This extracts τII-time curves from LaMEM results, by computing the average stre
"""
function StressTime_0D(FileName::String, DirName::String="")

Timestep, _, _= Read_LaMEM_simulation(FileName, DirName);
Timestep, _, _= read_LaMEM_simulation(FileName, DirName);

N = length(Timestep)
τII_vec = Vector{Float64}(undef, N)
Expand Down
6 changes: 3 additions & 3 deletions test/t24_Erosion_Sedimentation/t24_CreateSetup.jl
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,16 @@ function t24_CreateMarkers(dir="./", ParamFile="test.dat"; NumberCores=1, is64bi

# Save julia setup
Model3D = CartData(Grid, (Phases=Phase,Temp=Temp)) # Create LaMEM model:
Write_Paraview(Model3D,"LaMEM_ModelSetup", verbose=false) # Save model to paraview (load with opening LaMEM_ModelSetup.vts in paraview)
write_paraview(Model3D,"LaMEM_ModelSetup", verbose=false) # Save model to paraview (load with opening LaMEM_ModelSetup.vts in paraview)

# Save LaMEM markers
if NumberCores==1
# 1 core
Save_LaMEMMarkersParallel(Model3D, directory="./markers_p$NumberCores", verbose=false) # Create LaMEM marker input on 1 core
save_LaMEM_markers_parallel(Model3D, directory="./markers_p$NumberCores", verbose=false) # Create LaMEM marker input on 1 core
else
#> 1 cores; create partitioning file first
PartFile = CreatePartitioningFile_local(ParamFile, NumberCores; LaMEM_dir="../../bin", mpiexec=mpiexec)
Save_LaMEMMarkersParallel(Model3D, PartitioningFile=PartFile, directory="./markers_p$NumberCores", verbose=false, is64bit=is64bit)
save_LaMEM_markers_parallel(Model3D, PartitioningFile=PartFile, directory="./markers_p$NumberCores", verbose=false, is64bit=is64bit)
end

cd(cur_dir)
Expand Down
6 changes: 3 additions & 3 deletions test/t3_SubductionGMGinput/CreateMarkers_Subduction.jl
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ function CreateMarkers_Subduction(dir="./", ParamFile="test.dat"; NumberCores=1,

# Save julia setup
Model3D = CartData(Grid, (Phases=Phases,Temp=Temp)) # Create LaMEM model:
Write_Paraview(Model3D,"LaMEM_ModelSetup", verbose=false) # Save model to paraview (load with opening LaMEM_ModelSetup.vts in paraview)
write_paraview(Model3D,"LaMEM_ModelSetup", verbose=false) # Save model to paraview (load with opening LaMEM_ModelSetup.vts in paraview)

# Save LaMEM markers
if NumberCores==1
# 1 core
Save_LaMEMMarkersParallel(Model3D, directory="./markers", verbose=false) # Create LaMEM marker input on 1 core
save_LaMEM_markers_parallel(Model3D, directory="./markers", verbose=false) # Create LaMEM marker input on 1 core
else
#> 1 cores; create partitioning file first
PartFile = CreatePartitioningFile_local(ParamFile, NumberCores; LaMEM_dir="../../bin/", mpiexec=mpiexec)
Save_LaMEMMarkersParallel(Model3D, PartitioningFile=PartFile, directory="./markers", verbose=false)
save_LaMEM_markers_parallel(Model3D, PartitioningFile=PartFile, directory="./markers", verbose=false)
end

cd(cur_dir)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,17 @@ function CreateMarkers_SubductionVEP(dir="./", ParamFile="Subduction_VEP.dat"; N

# Save julia setup
Model3D = CartData(Grid, (Phases=Phase,Temp=Temp)) # Create LaMEM model:
Write_Paraview(Model3D,"LaMEM_ModelSetup_VEP", verbose=false) # Save model to paraview (load with opening LaMEM_ModelSetup.vts in paraview)
write_paraview(Model3D,"LaMEM_ModelSetup_VEP", verbose=false) # Save model to paraview (load with opening LaMEM_ModelSetup.vts in paraview)

# Save LaMEM markers
if NumberCores==1
# 1 core
Save_LaMEMMarkersParallel(Model3D, directory="./markers", verbose=false) # Create LaMEM marker input on 1 core
save_LaMEM_markers_parallel(Model3D, directory="./markers", verbose=false) # Create LaMEM marker input on 1 core
else
#> 1 cores; create partitioning file first
#PartFile = CreatePartitioningFile(ParamFile,NumberCores, LaMEM_dir="../../bin/opt/", verbose=false);
PartFile = CreatePartitioningFile_local(ParamFile, NumberCores; LaMEM_dir="../../bin/", mpiexec=mpiexec)
Save_LaMEMMarkersParallel(Model3D, PartitioningFile=PartFile, directory="./markers", verbose=false, is64bit=is64bit)
save_LaMEM_markers_parallel(Model3D, PartitioningFile=PartFile, directory="./markers", verbose=false, is64bit=is64bit)
end

cd(cur_dir)
Expand Down

0 comments on commit 042f0bd

Please sign in to comment.