Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Geometric primitives #41

Merged
merged 3 commits into from
Feb 19, 2024
Merged

Geometric primitives #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9c092e
add geometric primitives
boriskaus Feb 19, 2024
e3db721
bugfixes and add test
boriskaus Feb 19, 2024
7b1f552
typos
boriskaus Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/LaMEM.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ using .LaMEM_Model
export LaMEM_Model, Model, Write_LaMEM_InputFile, create_initialsetup,
Scaling, Grid, Time, FreeSurface, BoundaryConditions, VelocityBox, SolutionParams,
Solver, ModelSetup,
geom_Sphere,
geom_Sphere, geom_Ellipsoid, geom_Box, geom_RidgeSeg, geom_Hex, geom_Layer, geom_Cylinder,
Output,
Multigrid, print_short,
Materials, Phase, Softening, PhaseTransition, PhaseAggregate, Dike, PassiveTracers,
add_vbox!, rm_vbox!, rm_last_vbox!,
add_phase!, rm_phase!, rm_last_phase!, replace_phase!, add_petsc!, add_softening!, add_phaseaggregate!,
add_phasetransition!, add_dike!, add_geom!, set_air, copy_phase,
add_phasetransition!, add_dike!, add_geom!, rm_geom!, set_air, copy_phase,
add_topography!, AboveSurface!, BelowSurface!,
prepare_lamem, isdefault, hasplasticity,
add_geoparams_rheologies,
Expand Down
6 changes: 5 additions & 1 deletion src/LaMEM_ModelGeneration/Model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ end
Prepares a LaMEM run for the parameters that are specified in `model`, without running the simulation

1) Create the `*.dat` file
2) Write markers to disk
2) Write markers to disk in case we use a "files" setup

This is useful if you want to prepare a model on one machine but run it on another one (e.g. a cluster)

Expand Down Expand Up @@ -265,6 +265,9 @@ end

Creates the initial model setup of LaMEM from `model`, which includes:
- Writing the LaMEM (*.dat) input file

and in case we do not employt geometric primitives to create the setup:

- Write the VTK file (if requested when `model.Output.write_VTK_setup=true`)
- Write the marker files to disk (if `model.ModelSetup.msetup="files"`)

Expand All @@ -280,6 +283,7 @@ function create_initialsetup(model::Model, cores::Int64=1, args::String=""; verb

Write_LaMEM_InputFile(model, model.Output.param_file_name)


if !isnothing(model.FreeSurface.Topography)
Save_LaMEMTopography(model.FreeSurface.Topography, model.FreeSurface.surf_topo_file)
end
Expand Down
Loading
Loading