Disable Expuh node for now

Author: ConnectedSystems

docs/src/API/nodes/IHACRES.md

@@ -5,11 +5,3 @@ Modules = [Streamfall]
 Order   = [:function, :type]
 Pages   = ["Nodes/IHACRES/IHACRESNode.jl"]
 ```
-
-### IHACRES - Expuh
-
-```@autodocs
-Modules = [Streamfall]
-Order   = [:function, :type]
-Pages   = ["IHACRESExpuhNode.jl"]
-```

src/Nodes/IHACRES/IHACRESExpuhNode.jl src/Nodes/IHACRES/_IHACRESExpuhNode.jlsrc/Nodes/IHACRES/IHACRESExpuhNode.jl renamed to src/Nodes/IHACRES/_IHACRESExpuhNode.jl

@@ -1,8 +1,14 @@
+"""
+Current disabled. 
+
+Expuh node implementation needs to be updated to use pure julia methods.
+"""
+
 using Parameters
 using ModelParameters
 
 
-Base.@kwdef mutable struct ExpuhNode{P, A<:AbstractFloat} <: IHACRESNode
+Base.@kwdef mutable struct ExpuhNode{P,A<:AbstractFloat} <: IHACRESNode
     name::String
     area::A
 
@@ -95,9 +101,9 @@ end
 
 
 function ExpuhNode(name::String, area::Float64, d::Float64, d2::Float64, e::Float64, f::Float64,
-                    tau_q::Float64, tau_s::Float64, v_s::Float64, s_coef::Float64,
-                    store::Float64, quick::Float64, slow::Float64)
-    return ExpuhNode{Param, Float64}(
+    tau_q::Float64, tau_s::Float64, v_s::Float64, s_coef::Float64,
+    store::Float64, quick::Float64, slow::Float64)
+    return ExpuhNode{Param,Float64}(
         name=name,
         area=area,
         d=d,
@@ -165,23 +171,21 @@ function run_node!(
 
     flow_res = [0.0, 0.0, 0.0]
     @ccall IHACRES.calc_flows(flow_res::Ptr{Cdouble}, prev_q::Cdouble, prev_s::Cdouble, s_node.v_s::Cdouble, e_rainfall::Cdouble,
-                              s_node.area::Cdouble, s_node.tau_q::Cdouble, s_node.tau_s::Cdouble)::Cvoid
+        s_node.area::Cdouble, s_node.tau_q::Cdouble, s_node.tau_s::Cdouble)::Cvoid
     (quick_store, slow_store, outflow) = flow_res
 
     gw_store = s_node.gw_store[end]
     routing_res = [0.0, 0.0]
     @ccall IHACRES.routing(
-            routing_res::Ptr{Cdouble},
-            gw_store::Cdouble,
-            s_node.storage_coef::Cdouble,
-            inflow::Cdouble,
-            outflow::Cdouble,
-            ext::Cdouble,
-            gw_exchange::Cdouble)::Cvoid
+        routing_res::Ptr{Cdouble},
+        gw_store::Cdouble,
+        s_node.storage_coef::Cdouble,
+        inflow::Cdouble,
+        outflow::Cdouble,
+        ext::Cdouble,
+        gw_exchange::Cdouble)::Cvoid
     (gw_store, outflow) = routing_res
 
-    # level::Float64 = @ccall IHACRES.calc_ft_level(outflow::Cdouble, s_node.level_params::Ptr{Cdouble})::Cdouble
-
     update_state!(s_node, cmd, e_rainfall, et, quick_store, slow_store, outflow, gw_store)
 
     return outflow
@@ -211,19 +215,19 @@ function run_node_with_temp!(s_node::ExpuhNode, rain::Float64, temp::Float64, in
 
     flow_res = [0.0, 0.0, 0.0]
     @ccall IHACRES.calc_flows(flow_res::Ptr{Cdouble}, prev_q::Cdouble, prev_s::Cdouble, s_node.v_s::Cdouble, e_rainfall::Cdouble,
-                              s_node.area::Cdouble, s_node.tau_q::Cdouble, s_node.tau_s::Cdouble)::Cvoid
+        s_node.area::Cdouble, s_node.tau_q::Cdouble, s_node.tau_s::Cdouble)::Cvoid
     (quick_store, slow_store, outflow) = flow_res
 
     gw_store = s_node.gw_store[end]
     routing_res = [0.0, 0.0]
     @ccall IHACRES.routing(
-            routing_res::Ptr{Cdouble},
-            gw_store::Cdouble,
-            s_node.storage_coef::Cdouble,
-            inflow::Cdouble,
-            outflow::Cdouble,
-            ext::Cdouble,
-            gw_exchange::Cdouble)::Cvoid
+        routing_res::Ptr{Cdouble},
+        gw_store::Cdouble,
+        s_node.storage_coef::Cdouble,
+        inflow::Cdouble,
+        outflow::Cdouble,
+        ext::Cdouble,
+        gw_exchange::Cdouble)::Cvoid
     (gw_store, outflow) = routing_res
 
     # level::Float64 = @ccall IHACRES.calc_ft_level(outflow::Cdouble, s_node.level_params::Ptr{Cdouble})::Cdouble
@@ -235,7 +239,7 @@ end
 
 
 function update_params!(node::ExpuhNode, d::Float64, d2::Float64, e::Float64, f::Float64,
-                        tau_q::Float64, tau_s::Float64, v_s::Float64, s_coef::Float64)::Nothing
+    tau_q::Float64, tau_s::Float64, v_s::Float64, s_coef::Float64)::Nothing
     node.d = Param(d, bounds=node.d.bounds)
     node.d2 = Param(d2, bounds=node.d2.bounds)
     node.e = Param(e, bounds=node.e.bounds)

src/Streamfall.jl

@@ -12,7 +12,7 @@ include("Climate.jl")
 include("metrics.jl")
 include("calibration.jl")
 include("Nodes/IHACRES/IHACRESNode.jl")
-include("Nodes/IHACRES/IHACRESExpuhNode.jl")
+# include("Nodes/IHACRES/IHACRESExpuhNode.jl")
 include("Nodes/GR4J/GR4JNode.jl")
 include("Nodes/HyMod/HyModNode.jl")
 include("Nodes/SYMHYD/SYMHYDNode.jl")
@@ -278,7 +278,7 @@ include("plotting.jl")
 
 # Nodes
 export NetworkNode, GenericNode, GenericDirectNode
-export IHACRES, IHACRESNode, IHACRESBilinearNode, ExpuhNode, DamNode, Climate
+export IHACRES, IHACRESNode, IHACRESBilinearNode, DamNode, Climate
 export create_node, GR4JNode, HyModNode, SimpleHyModNode, SYMHYDNode
 export EnsembleNode, WeightedEnsembleNode, GREnsembleNode
 

test/runtests.jl

@@ -10,7 +10,7 @@ TEST_DIR = @__DIR__
     ihacres = create_node(IHACRESBilinearNode, "IHACRES", 100.0)
 
     # Expuh form does not yet support time stepping
-    expuh = create_node(ExpuhNode, "Expuh", 100.0)
+    # expuh = create_node(ExpuhNode, "Expuh", 100.0)
 
     gr4j = create_node(GR4JNode, "GR4J", 100.0)
     hymod = create_node(SimpleHyModNode, "HyMod", 100.0)