Refactor some modules, add glacier lake example

NIVANorge · Feb 12, 2025 · 7979aab · 7979aab
1 parent 8c55971
commit 7979aab
Show file tree

Hide file tree

Showing 15 changed files with 1,553 additions and 192 deletions.
diff --git a/models/easylake_simplycnp_model.txt b/models/easylake_simplycnp_model.txt
@@ -19,8 +19,10 @@ model("EasyLake-SimplyCNP") {
 		module("AirSeaGas", "AirSeaGas Lake", air, epi, o2, co2, ch4, temp, wind, precip, o2satconc, pressure, loc(epi.ice.indicator), loc(epi.water), loc(epi.area), loc(constant(false)))
 	) 
 
+	load("modules/rivertemp_o2.txt",
+		module("Simple River O₂", river, water, o2, temp))
+
 	load("modules/easylake/easychem.txt",
-		module("Simple River O₂", river, water, o2, temp),
 		module("EasyChem", epi, hyp, water, oc, phyt, o2, din, phos, on, op, sed, temp, sw, tp, tdp, tn, toc, chl_a, o2satconc, area, om_cnp),
 		module("EasyChem-Particulate", air, epi, hyp, water, sed, wind, area, downstream, loc(out)),
 		module("EasyChem-Sediment-Simple-P", epi, hyp, water, phos, area)

diff --git a/models/easylake_simplycnp_model_new.txt b/models/easylake_simplycnp_model_new.txt
@@ -19,8 +19,9 @@ model("EasyLake-SimplyCNP") {
 		module("AirSeaGas", "AirSeaGas Lake", air, epi, o2, co2, ch4, temp, wind, precip, o2satconc, pressure, loc(epi.ice.indicator), loc(epi.water), loc(epi.area), loc(constant(false)))
 	) 
 
+	load("modules/rivertemp_o2.txt", module("Simple River O₂", river, water, o2, temp))
+
 	load("modules/easylake/easychem_new.txt",
-		module("Simple River O₂", river, water, o2, temp),
 		module("EasyChem", epi, hyp, water, oc, phyt, o2, din, phos, on, op, sed, temp, sw, tp, tdp, tn, toc, chl_a, o2satconc, area, om_cnp, phyt_par_lake),
 		module("EasyChem-Particulate", air, epi, hyp, water, sed, wind, area, downstream, loc(out)),
 		module("EasyChem-Sediment-Simple-P", epi, hyp, water, phos, area)

diff --git a/models/easylake_simplyq_model.txt b/models/easylake_simplyq_model.txt
@@ -43,7 +43,7 @@ model("EasyLake-SimplyQ") {
 	freeze_temp : constant("Lake ice formation temperature", [deg_c], 0)
 
 	load("modules/simplysoiltemp.txt", module("Simply soil temperature", air, soil, snow_box, snow, temp))
-	load("modules/rivertemp.txt",      module("RiverTemperature", air, soil, river, water, heat, temp))
+	load("modules/rivertemp_o2.txt",   module("RiverTemperature", air, soil, river, water, heat, temp))
 	load("modules/atmospheric.txt",    module("Atmospheric", air, temp, wind, g_rad, pressure, a_hum, rho, lwd, cos_z, a_vap, s_vap))
 	load("modules/airsea.txt",         module("AirSea", "AirSea Lake", air, epi, ice, heat, temp, precip, 
 						wind, g_rad, pressure, rho, a_hum, lwd, sw, attn, indicator,