MineralsCloud · singularitti · Nov 19, 2023 · Nov 19, 2023 · Nov 19, 2023 · Nov 19, 2023
diff --git a/docs/src/run/cli.md b/docs/src/run/cli.md
@@ -19,7 +19,7 @@ and submit it to a workload manager like [Slurm](https://www.schedmd.com/).
 However, users can also request an interactive session and run code Julia REPL.
 
 ```julia-repl
-julia> using Express.EquationOfStateWorkflow.Recipes
+julia> using Express.EquationOfState.Recipes
 
 julia> using QuantumESPRESSOExpress
 
@@ -28,8 +28,8 @@ julia> workflow = buildworkflow("eos.toml");
 julia> run!(workflow);
 ```
 
-For phonon and the QHA workflow, run `using Express.PhononWorkflow.Recipes`
-and `using Express.QuasiHarmonicApproxWorkflow.Recipes` in the first step.
+For phonon and the QHA workflow, run `using Express.Phonon.Recipes`
+and `using Express.QuasiHarmonicApprox.Recipes` in the first step.
 
 In an EOS workflow, the final results include outputs returned by Quantum ESPRESSO, a list
 of raw data (volume-energy pairs), and a fitted EOS. If something goes wrong, the workflow

diff --git a/docs/src/troubleshooting.md b/docs/src/troubleshooting.md
@@ -223,7 +223,7 @@ workflow (an equation of state workflow in this case). And after the following J
 commands:
 
 ```julia
-using Express.PhononWorkflow.Recipes
+using Express.Phonon.Recipes
 using QuantumESPRESSOExpress
 
 wf = buildworkflow("phonon.yaml")

diff --git a/src/ConvergenceTestWorkflow/Config.jl → src/ConvergenceTest/Config.jl b/src/ConvergenceTestWorkflow/Config.jl → src/ConvergenceTest/Config.jl
diff --git a/...ceTestWorkflow/ConvergenceTestWorkflow.jl → src/ConvergenceTest/ConvergenceTest.jl b/...ceTestWorkflow/ConvergenceTestWorkflow.jl → src/ConvergenceTest/ConvergenceTest.jl
@@ -1,4 +1,4 @@
-module ConvergenceTestWorkflow
+module ConvergenceTest
 
 include("Config.jl")
 include("actions.jl")

diff --git a/src/ConvergenceTestWorkflow/Recipes.jl → src/ConvergenceTest/Recipes.jl b/src/ConvergenceTestWorkflow/Recipes.jl → src/ConvergenceTest/Recipes.jl
@@ -8,7 +8,7 @@ using ExpressBase.Recipes: Recipe
 using SimpleWorkflows: Workflow, run!
 
 using ..Config: StaticConfig, expand
-using ..ConvergenceTestWorkflow:
+using ..ConvergenceTest:
     DownloadPotentials,
     CreateInput,
     WriteInput,

diff --git a/src/ConvergenceTestWorkflow/actions.jl → src/ConvergenceTest/actions.jl b/src/ConvergenceTestWorkflow/actions.jl → src/ConvergenceTest/actions.jl
diff --git a/src/ConvergenceTestWorkflow/think.jl → src/ConvergenceTest/think.jl b/src/ConvergenceTestWorkflow/think.jl → src/ConvergenceTest/think.jl
diff --git a/src/EquationOfStateWorkflow/Config.jl → src/EquationOfState/Config.jl b/src/EquationOfStateWorkflow/Config.jl → src/EquationOfState/Config.jl
diff --git a/...fStateWorkflow/EquationOfStateWorkflow.jl → src/EquationOfState/EquationOfState.jl b/...fStateWorkflow/EquationOfStateWorkflow.jl → src/EquationOfState/EquationOfState.jl
@@ -1,4 +1,4 @@
-module EquationOfStateWorkflow
+module EquationOfState
 
 include("Config.jl")
 include("actions.jl")

diff --git a/src/EquationOfStateWorkflow/Recipes.jl → src/EquationOfState/Recipes.jl b/src/EquationOfStateWorkflow/Recipes.jl → src/EquationOfState/Recipes.jl
@@ -8,7 +8,7 @@ using ExpressBase.Recipes: Recipe
 using SimpleWorkflows: Workflow, run!
 
 using ..Config: StaticConfig, expand
-using ..EquationOfStateWorkflow:
+using ..EquationOfState:
     DownloadPotentials,
     ComputeVolume,
     CreateInput,

diff --git a/src/EquationOfStateWorkflow/actions.jl → src/EquationOfState/actions.jl b/src/EquationOfStateWorkflow/actions.jl → src/EquationOfState/actions.jl
diff --git a/src/EquationOfStateWorkflow/think.jl → src/EquationOfState/think.jl b/src/EquationOfStateWorkflow/think.jl → src/EquationOfState/think.jl
diff --git a/src/Express.jl b/src/Express.jl
@@ -2,10 +2,10 @@ module Express
 
 # include("SelfConsistentField.jl")
 # include("BandStructure.jl")
-include("ConvergenceTestWorkflow/ConvergenceTestWorkflow.jl")
-include("EquationOfStateWorkflow/EquationOfStateWorkflow.jl")
+include("ConvergenceTest/ConvergenceTest.jl")
+include("EquationOfState/EquationOfState.jl")
 # include("StaticElasticity/StaticElasticity.jl")
-include("PhononWorkflow/PhononWorkflow.jl")
-# include("QuasiHarmonicApproxWorkflow/QuasiHarmonicApproxWorkflow.jl")
+include("Phonon/Phonon.jl")
+# include("QuasiHarmonicApprox/QuasiHarmonicApprox.jl")
 
 end
diff --git a/src/PhononWorkflow/Config.jl → src/Phonon/Config.jl b/src/PhononWorkflow/Config.jl → src/Phonon/Config.jl
diff --git a/src/PhononWorkflow/PhononWorkflow.jl → src/Phonon/Phonon.jl b/src/PhononWorkflow/PhononWorkflow.jl → src/Phonon/Phonon.jl
@@ -1,4 +1,4 @@
-module PhononWorkflow
+module Phonon
 
 include("Config.jl")
 include("actions.jl")

diff --git a/src/PhononWorkflow/Recipes.jl → src/Phonon/Recipes.jl b/src/PhononWorkflow/Recipes.jl → src/Phonon/Recipes.jl
@@ -15,7 +15,7 @@ using SimpleWorkflows: Workflow, run!
 using Thinkers: Thunk, setargs!
 
 using ..Config: StaticConfig, expand
-using ..PhononWorkflow: DownloadPotentials, CreateInput, WriteInput, RunCmd
+using ..Phonon: DownloadPotentials, CreateInput, WriteInput, RunCmd
 
 struct PhononDispersionRecipe <: Recipe
     config

diff --git a/src/PhononWorkflow/actions.jl → src/Phonon/actions.jl b/src/PhononWorkflow/actions.jl → src/Phonon/actions.jl
diff --git a/src/PhononWorkflow/think.jl → src/Phonon/think.jl b/src/PhononWorkflow/think.jl → src/Phonon/think.jl
diff --git a/src/QuasiHarmonicApproxWorkflow/Config.jl → src/QuasiHarmonicApprox/Config.jl b/src/QuasiHarmonicApproxWorkflow/Config.jl → src/QuasiHarmonicApprox/Config.jl
diff --git a/...oxWorkflow/QuasiHarmonicApproxWorkflow.jl → ...uasiHarmonicApprox/QuasiHarmonicApprox.jl b/...oxWorkflow/QuasiHarmonicApproxWorkflow.jl → ...uasiHarmonicApprox/QuasiHarmonicApprox.jl
@@ -1,4 +1,4 @@
-module QuasiHarmonicApproxWorkflow
+module QuasiHarmonicApprox
 
 include("Config.jl")
 include("actions.jl")

diff --git a/src/QuasiHarmonicApproxWorkflow/Recipes.jl → src/QuasiHarmonicApprox/Recipes.jl b/src/QuasiHarmonicApproxWorkflow/Recipes.jl → src/QuasiHarmonicApprox/Recipes.jl
@@ -6,7 +6,7 @@ using ExpressBase.Recipes: Recipe
 using EasyJobsBase: Job
 using SimpleWorkflows: Workflow, run!, →
 
-using ..QuasiHarmonicApproxWorkflow: MakeInput, CalculateThermodyn, Plot
+using ..QuasiHarmonicApprox: MakeInput, CalculateThermodyn, Plot
 
 import ...Express: jobify
 

diff --git a/src/QuasiHarmonicApproxWorkflow/actions.jl → src/QuasiHarmonicApprox/actions.jl b/src/QuasiHarmonicApproxWorkflow/actions.jl → src/QuasiHarmonicApprox/actions.jl
diff --git a/test/QuasiHarmonicApproxWorkflow.jl b/test/QuasiHarmonicApproxWorkflow.jl
@@ -1,8 +1,8 @@
-module QuasiHarmonicApproxWorkflow
+module QuasiHarmonicApprox
 
 using ExpressBase.Files: load
-using Express.QuasiHarmonicApproxWorkflow: QuasiHarmonicApproximation
-using Express.QuasiHarmonicApproxWorkflow.Config: ExpandConfig
+using Express.QuasiHarmonicApprox: QuasiHarmonicApproximation
+using Express.QuasiHarmonicApprox.Config: ExpandConfig
 using Test
 
 @testset "Load a configuration file: silicon" begin

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -2,5 +2,5 @@ using Express
 using Test
 
 @testset "Express.jl" begin
-    include("QuasiHarmonicApproxWorkflow.jl")
+    include("QuasiHarmonicApprox.jl")
 end