Merge pull request #18 from ConnectedSystems/prj-restructure

Restructure project
ConnectedSystems · Nov 30, 2024 · dca458f · dca458f
2 parents 112d0a3 + fcb16ca
commit dca458f
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 30 deletions.
diff --git a/src/DamNode.jl → src/Nodes/DamNode.jl b/src/DamNode.jl → src/Nodes/DamNode.jl
diff --git a/src/EnsembleNode.jl → src/Nodes/EnsembleNode.jl b/src/EnsembleNode.jl → src/Nodes/EnsembleNode.jl
diff --git a/src/GR4JNode.jl → src/Nodes/GR4J/GR4JNode.jl b/src/GR4JNode.jl → src/Nodes/GR4J/GR4JNode.jl
diff --git a/src/HyModNode.jl → src/Nodes/HyMod/HyModNode.jl b/src/HyModNode.jl → src/Nodes/HyMod/HyModNode.jl
diff --git a/src/IHACRESExpuhNode.jl → src/Nodes/IHACRES/IHACRESExpuhNode.jl b/src/IHACRESExpuhNode.jl → src/Nodes/IHACRES/IHACRESExpuhNode.jl
diff --git a/src/IHACRESNode.jl → src/Nodes/IHACRES/IHACRESNode.jl b/src/IHACRESNode.jl → src/Nodes/IHACRES/IHACRESNode.jl
diff --git a/src/Node.jl → src/Nodes/Node.jl b/src/Node.jl → src/Nodes/Node.jl
diff --git a/src/SYMHYDNode.jl → src/Nodes/SYMHYD/SYMHYDNode.jl b/src/SYMHYDNode.jl → src/Nodes/SYMHYD/SYMHYDNode.jl
diff --git a/src/StateEnsembleNode.jl → src/Nodes/StateEnsembleNode.jl b/src/StateEnsembleNode.jl → src/Nodes/StateEnsembleNode.jl
diff --git a/src/Streamfall.jl b/src/Streamfall.jl
@@ -22,35 +22,14 @@ end
 const IHACRES = joinpath(MODPATH, "../deps", "usr", "lib", "ihacres$(libext)")
 
 
-"""@def macro
-
-Inline code to avoid repetitious declarations.
-"""
-macro def(name, definition)
-    return quote
-        macro $(esc(name))()
-            esc($(Expr(:quote, definition)))
-        end
-    end
-end
-
-
-@def add_preprefix begin
-    if !isnothing(id_prefix)
-        prefix = id_prefix * prefix
-    end
-end
-
-
 include("Network.jl")
-include("Node.jl")
+include("Nodes/Node.jl")
 include("Climate.jl")
-# include("Operation.jl")
-include("IHACRESNode.jl")
-include("IHACRESExpuhNode.jl")
-include("GR4JNode.jl")
-include("HyModNode.jl")
-include("SYMHYDNode.jl")
+include("Nodes/IHACRES/IHACRESNode.jl")
+include("Nodes/IHACRES/IHACRESExpuhNode.jl")
+include("Nodes/GR4J/GR4JNode.jl")
+include("Nodes/HyMod/HyModNode.jl")
+include("Nodes/SYMHYD/SYMHYDNode.jl")
 include("DamNode.jl")
 include("EnsembleNode.jl")
 
@@ -252,9 +231,6 @@ include("calibration.jl")
 include("Analysis/Analysis.jl")
 include("plotting.jl")
 
-
-export @def
-
 # Nodes
 export NetworkNode, GenericNode, GenericDirectNode
 export IHACRES, IHACRESNode, BilinearNode, ExpuhNode, DamNode, Climate