Skip to content

Paw #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
par456 merged 2 commits into from
May 26, 2025
Merged

Paw #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f88b43
Fix PAW and PAWC calculations
hol353 May 26, 2025
1283f2a
Merge branch 'master' of https://github.com/APSIMInitiative/APSoil in…
hol353 May 26, 2025
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
20 changes: 10 additions & 10 deletions API/Services/OldToNewSoilMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ public static APSIM.Soils.Soil ToAPSIMSoil(this Models.Soil soil)
var apsimSoil = mapper.Map<APSIM.Soils.Soil>(soil);

// Some manual mapping. Can't find a way for AutoMapper to do it.
apsimSoil.Physical.Rocks = soil.Analysis.Rocks.ToList();
apsimSoil.Physical.RocksMetadata = soil.Analysis.RocksMetadata.ToList();
apsimSoil.Physical.Texture = soil.Analysis.Texture.ToList();
apsimSoil.Physical.TextureMetadata = soil.Analysis.TextureMetadata.ToList();
apsimSoil.Physical.ParticleSizeClay = soil.Analysis.ParticleSizeClay.ToList();
apsimSoil.Physical.ParticleSizeClayMetadata = soil.Analysis.ParticleSizeClayMetadata.ToList();
apsimSoil.Physical.ParticleSizeSand = soil.Analysis.ParticleSizeSand.ToList();
apsimSoil.Physical.ParticleSizeSandMetadata = soil.Analysis.ParticleSizeSandMetadata.ToList();
apsimSoil.Physical.ParticleSizeSilt = soil.Analysis.ParticleSizeSilt.ToList();
apsimSoil.Physical.ParticleSizeSiltMetadata = soil.Analysis.ParticleSizeSiltMetadata.ToList();
apsimSoil.Physical.Rocks = soil.Analysis.Rocks?.ToList();
apsimSoil.Physical.RocksMetadata = soil.Analysis.RocksMetadata?.ToList();
apsimSoil.Physical.Texture = soil.Analysis.Texture?.ToList();
apsimSoil.Physical.TextureMetadata = soil.Analysis.TextureMetadata?.ToList();
apsimSoil.Physical.ParticleSizeClay = soil.Analysis.ParticleSizeClay?.ToList();
apsimSoil.Physical.ParticleSizeClayMetadata = soil.Analysis.ParticleSizeClayMetadata?.ToList();
apsimSoil.Physical.ParticleSizeSand = soil.Analysis.ParticleSizeSand?.ToList();
apsimSoil.Physical.ParticleSizeSandMetadata = soil.Analysis.ParticleSizeSandMetadata?.ToList();
apsimSoil.Physical.ParticleSizeSilt = soil.Analysis.ParticleSizeSilt?.ToList();
apsimSoil.Physical.ParticleSizeSiltMetadata = soil.Analysis.ParticleSizeSiltMetadata?.ToList();
return apsimSoil;
}

Expand Down