update

Author: TorkelE

src/Catalyst.jl

@@ -13,7 +13,9 @@ using JumpProcesses: JumpProcesses,
 # ModelingToolkit imports and convenience functions we use
 using ModelingToolkit
 const MT = ModelingToolkit
-using DynamicQuantities# , Unitful # Having Unitful here as well currently gives an error.
+using DynamicQuantities#, Unitful # Having Unitful here as well currently gives an error.
+
+
 @reexport using ModelingToolkit
 using Symbolics
 

src/networkapi.jl

@@ -1624,12 +1624,21 @@ function validate(rs::ReactionSystem, info::String = "")
             rxunits *= get_unit(sub)^rx.substoich[i]
         end
 
-        if !isequal(rxunits, rateunits)
-            validated = false
-            @warn(string("Reaction rate laws are expected to have units of ", rateunits,
-                         " however, ", rx, " has units of ", rxunits, "."))
+        # Checks that the reaction's combined units is correct, if not, throws a warning.
+        # Needs additional checks because for cases: (1.0^n) and (1.0^n1)*(1.0^n2).
+        # These are not considered (be default) considered equal to `1.0` for unitless reactions.
+        isequal(rxunits, rateunits) && continue
+        if istree(rxunits) 
+            unitless_exp(rxunits) && continue
+            (operation(rxunits) == *) && all(unitless_exp(arg) for arg in arguments(rxunits)) && continue
         end
+        validated = false
+        @warn(string("Reaction rate laws are expected to have units of ", rateunits, " however, ", 
+                     rx, " has units of ", rxunits, "."))
     end
 
     validated
 end
+
+# Checks if a unit consist of exponents with base 1 (and is this unitless).
+unitless_exp(u) = istree(u) && (operation(u) == ^) && (arguments(u)[1] == 1)

test/miscellaneous_tests/units.jl

@@ -17,7 +17,8 @@ let
     rxs = [Reaction(k1, nothing, [A]),
         Reaction(k2, [A], [B]),
         Reaction(k3, [A, B], [B], [1, 1], [2])]
-    @test_nowarn @named rs = ReactionSystem(rxs, t, [A, B, C], [k1, k2, k3])
+    @test_nowarn ReactionSystem(rxs, t, [A, B, C], [k1, k2, k3]; name = :rs)
+    @named rs = ReactionSystem(rxs, t, [A, B, C], [k1, k2, k3])
     rs = complete(rs)
 
     # Test that all reactions have the correct unit.
@@ -149,46 +150,43 @@ end
 # Checks that units works for various non-trivial systems.
 let
     # Parametric rates (no units).
-    @test_broken false # This yields a warning (and it shouldn't).
-    rn = @reaction_network begin
+    @test_nowarn @reaction_network begin
         k1, 2X1 --> Z1
         k2, n2*X2 --> m2*Z2
         k3, n3*X3 + m3*Y3--> Z3
     end
 
     # Parametric rates with units is not possible, since the unit depends on the parameter values.
 
-    # Non-constant rates (no units).
-    @test_nowarn rn = @reaction_network begin
+    # Non-trivial rates (no units).
+    @test_nowarn @reaction_network begin
         k1*X1, 2X1 --> Z1
         mm(X2, v2, K2), X2 --> Z2
         hill(X3, v3, K3, n3), X3 + Y3--> Z3
     end
 
-    # Non-constant rates (units).
-    @test_broken false # The below expression generates an error on compile. Really no idea why, have 
-    # managed to make a really small example of it, but not figured it out yet.
-    # rn = @reaction_network begin
-    #     @ivs t [unit=u"s"]
-    #     @species begin
-    #         X1(t), [unit=u"m"]
-    #         Z1(t), [unit=u"m"]
-    #         X2(t), [unit=u"m"]
-    #         Z2(t), [unit=u"m"]
-    #         X3(t), [unit=u"m"]
-    #         Y3(t), [unit=u"m"]
-    #         Z3(t), [unit=u"m"]
-    #     end
-    #     @parameters begin
-    #         k1, [unit=u"m^(-4)/s"]
-    #         v2, [unit=u"m^(-4)/s"]
-    #         K2, [unit=u"m"]
-    #         v3, [unit=u"m^(-3)/s"]
-    #         K3, [unit=u"m"]
-    #         n3
-    #     end
-    #     k1*X1, 2X1 --> Z1
-    #     mm(X2, v, K), 3X2 --> Z2
-    #     hill(X3, v3, K3, n3), X3 + Y3--> Z3
-    # end
-    end
+    # Non-trivial rates (units).
+    @test_nowarn @reaction_network begin
+        @ivs t [unit=u"s"]
+        @species begin
+            X1(t), [unit=u"m"]
+            Z1(t), [unit=u"m"]
+            X2(t), [unit=u"m"]
+            Z2(t), [unit=u"m"]
+            X3(t), [unit=u"m"]
+            Y3(t), [unit=u"m"]
+            Z3(t), [unit=u"m"]
+        end
+        @parameters begin
+            k1, [unit=u"m^(-2)/s"]
+            v2, [unit=u"m^(-2)/s"]
+            K2, [unit=u"m"]
+            v3, [unit=u"m^(-1)/s"]
+            K3, [unit=u"m"]
+            n3
+        end
+        k1*X1, 2X1 --> Z1
+        mm(X2, v2, K2), 3X2 --> Z2
+        hill(X3, v3, K3, n3), X3 + Y3--> Z3
+    end
+end