resolve conflicts

BecksLab · Feb 20, 2023 · f14606c · f14606c
1 parent 9acc96d
commit f14606c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/EcologicalNetworksDynamics.jl b/src/EcologicalNetworksDynamics.jl
@@ -68,7 +68,7 @@ export DefaultGrowthParams
 export DefaultMaxConsumptionParams
 export DefaultMetabolismParams
 export DefaultMortalityParams
-export dNdt
+export DefaultNIntakeParams
 export draw_asymmetric_links
 export draw_symmetric_links
 export efficiency
@@ -124,8 +124,8 @@ export potential_refuge_links
 export predators_of
 export preys_of
 export producer_growth
-export ProducerGrowth
 export ProducerCompetition
+export ProducerGrowth
 export producers
 export richness
 export set_temperature!

diff --git a/src/model/dbdt.jl b/src/model/dbdt.jl
@@ -31,6 +31,10 @@ function dBdt!(dB, B, p, t)
         net_growth_rate = growth + eating - metabolism_loss
         net_growth_rate = EcologicalNetworksDynamics.effect_competition(net_growth_rate, i, B, network)
         dB[i] = net_growth_rate - being_eaten - natural_death
+        #pseudo coding starting here
+        #if type(params.ProducerGrowth) == NutrientIntak
+            #dN[i] = dndt(dN, N, p, t)
+        #end 
     end
 
     for j in S+1:S+length(N)