Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
a495014
Change "sftlf" units to percentage
rbeucher Jan 7, 2026
75481f8
Update land fraction calculations to return percentages and adjust un…
rbeucher Jan 7, 2026
5df847f
Add calc_cland_with_wood_products function and update mappings for la…
rbeucher Jan 7, 2026
f3277b7
Add calc_carbon_pool_kg_m2 function and update mappings for cLeaf cal…
rbeucher Jan 7, 2026
ce2d28b
Add cLitter mapping with calculation for carbon pool in kg m-2
rbeucher Jan 7, 2026
33b2ffb
Add cProduct mapping with calculation for carbon pool in kg m-2
rbeucher Jan 7, 2026
328d020
Add cRoot mapping with calculation for carbon pool in kg m-2
rbeucher Jan 7, 2026
db38f55
Update carbon pool calculations to use calc_carbon_pool_kg_m2
rbeucher Jan 7, 2026
6ad4cea
Add fDeforestToProduct mapping for carbon mass flux calculations
rbeucher Jan 7, 2026
6706d0c
Refactor average_tile to weighted_tile_sum and update mappings accord…
rbeucher Jan 7, 2026
ca64c8d
Add mappings for frozen and liquid water content of soil layers
rbeucher Jan 7, 2026
6f163c2
Add mrsol mapping for mass content of water in soil layer
rbeucher Jan 7, 2026
53e2210
Add nbp mapping for surface net downward mass flux of carbon dioxide …
rbeucher Jan 7, 2026
f68008d
Add mappings for net ecosystem production (nep) and nitrogen mass con…
rbeucher Jan 7, 2026
30e99a5
Add nitrogen mass pool calculations and update mappings in ACCESS-ESM1.6
rbeucher Jan 7, 2026
3bf7839
Add mapping for soil mass content of inorganic nitrogen in ACCESS-ESM1.6
rbeucher Jan 7, 2026
fdab1b8
Add mapping for net primary productivity of biomass expressed as carb…
rbeucher Jan 7, 2026
d9b80bc
Add mapping for nitrogen mass content of forestry and agricultural pr…
rbeucher Jan 7, 2026
4342d90
Add mapping for soil mass content of nitrogen in ACCESS-ESM1.6
rbeucher Jan 7, 2026
5fa929a
Add mapping for vegetation mass content of nitrogen in ACCESS-ESM1.6
rbeucher Jan 7, 2026
a30dee8
Add 'isel' function to custom_functions and mapping for surface altit…
rbeucher Jan 7, 2026
2314adb
Add mapping for surface upward mass flux of carbon dioxide due to het…
rbeucher Jan 7, 2026
252b284
Add mapping for land area fraction in ACCESS-ESM1.6
rbeucher Jan 7, 2026
1078ba1
Add vegetation type dimension to extract_tilefrac function and update…
rbeucher Jan 7, 2026
b7e10ef
Add level mapping for land fraction in ACCESS-ESM1.6
rbeucher Jan 7, 2026
1390fe0
Update level mapping and arguments for extract_tilefrac function in A…
rbeucher Jan 7, 2026
a62beb1
Add crop fraction mappings and update calculation parameters in ACCES…
rbeucher Jan 7, 2026
f66f2c9
Add grass fraction mappings and update calculation parameters in ACCE…
rbeucher Jan 7, 2026
431f51a
Add level parameter for land fraction mapping in ACCESS-ESM1.6
rbeucher Jan 7, 2026
7c4383b
Add level mappings for land fraction and tree fraction calculations i…
rbeucher Jan 7, 2026
cffd56e
Add tree fraction mapping and calculation parameters in ACCESS-ESM1.6
rbeucher Jan 7, 2026
c73303b
Add tree fraction mapping and calculation parameters in ACCESS-ESM1.6
rbeucher Jan 7, 2026
41502c0
Add tree fraction node for evergreen calculations in ACCESS-ESM1.6
rbeucher Jan 7, 2026
25e362e
Add vegetation fraction mapping and calculation parameters in ACCESS-…
rbeucher Jan 7, 2026
3e54add
Add wetland fraction mapping and calculation parameters in ACCESS-ESM1.6
rbeucher Jan 7, 2026
e4558a0
Add subsurface runoff flux mapping and calculation parameters in ACCE…
rbeucher Jan 7, 2026
300e6e6
Add nitrogen product mapping and calculation parameters in ACCESS-ESM1.6
rbeucher Jan 7, 2026
25e6a36
Refactor import order and clean up whitespace in derivations and mapp…
rbeucher Jan 7, 2026
221c499
Refactor pseudo-level assignment in calc_cland_with_wood_products (ha…
rbeucher Jan 8, 2026
923de0f
Refactor vegetation type dimension handling in extract_tilefrac and u…
rbeucher Jan 8, 2026
78a12d7
Avoid hardcoding pseudo_level name in weighted_tile_sum function
rbeucher Jan 8, 2026
1e1f808
Refactor nitrogen product mapping: remove redundant definition and st…
rbeucher Jan 8, 2026
51d8d3b
Fix typo in operation name from 'substract' to 'subtract' in ACCESS-E…
rbeucher Jan 8, 2026
72a1825
Update operands in add operation for ACCESS-ESM1.6 mappings
rbeucher Jan 8, 2026
5952813
Refactor calculation operation to use 'weighted_tile_sum' and update …
rbeucher Jan 8, 2026
435459a
Update variable lists in _filter_variables_by_test_data and change fi…
rbeucher Jan 8, 2026
e297bfa
Fix formatting in vegetation type dimension comment and update variab…
rbeucher Jan 8, 2026
d6b617e
Add landIce component and variable mappings to ACCESS-ESM1.6 mappings
rbeucher Jan 27, 2026
aade97f
gpp and npp needs to be divided by land fraction see #115
rbeucher Jan 28, 2026
2c60a1f
Add vegHeight variable mapping to ACCESS-ESM1.6 Fix #160
rbeucher Jan 29, 2026
bbc93e8
Refactor variable mappings: reintroduce evspsblsoi, mrro, mrros, mrsf…
rbeucher Feb 2, 2026
15408aa
Update land variable mappings in _filter_variables_by_test_data function
rbeucher Feb 2, 2026
f0ea1af
Add new soil moisture calculations and update ACCESS-ESM1.6 mappings
rbeucher Feb 2, 2026
fcee5c3
Refactor import statements in __init__.py and clean up whitespace in …
rbeucher Feb 2, 2026
385f525
Enhance calc_topsoil function to use lazy operations for improved eff…
rbeucher Feb 2, 2026
43459dc
pre-commit
rbeucher Feb 2, 2026
d4a15f5
pre-commit
rbeucher Feb 2, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/access_moppy/derivations/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,17 @@
clw_level_to_height,
)
from access_moppy.derivations.calc_land import (
average_tile,
calc_carbon_pool_kg_m2,
calc_cland_with_wood_products,
calc_landcover,
calc_mass_pool_kg_m2,
calc_mrsfl,
calc_mrsll,
calc_mrsol,
calc_nitrogen_pool_kg_m2,
calc_topsoil,
extract_tilefrac,
weighted_tile_sum,
)
from access_moppy.derivations.calc_utils import (
calculate_monthly_maximum,
Expand All @@ -38,10 +45,17 @@
"calc_topsoil": calc_topsoil,
"calc_landcover": calc_landcover,
"extract_tilefrac": extract_tilefrac,
"average_tile": average_tile,
"optical_depth": optical_depth,
"calculate_monthly_minimum": calculate_monthly_minimum,
"calculate_monthly_maximum": calculate_monthly_maximum,
"weighted_tile_sum": weighted_tile_sum,
"calc_cland_with_wood_products": calc_cland_with_wood_products,
"calc_carbon_pool_kg_m2": calc_carbon_pool_kg_m2,
"calc_mass_pool_kg_m2": calc_mass_pool_kg_m2,
"calc_nitrogen_pool_kg_m2": calc_nitrogen_pool_kg_m2,
"calc_mrsfl": calc_mrsfl,
"calc_mrsll": calc_mrsll,
"calc_mrsol": calc_mrsol,
}


Expand Down
Loading