Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

ogs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

9bd77069

Commit 9bd77069 authored 5 months ago by Dmitri Naumov

Downloads
- Plain Diff

Merge branch 'MplMediaMaterialIdsErrorHandling' into 'master'

MPL: Improve error report on media/material ids mismatch

See merge request ogs/ogs!5111

parents 6e1b1170 121f60c0

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Applications/ApplicationsLib/ProjectData.cpp 71 additions, 28 deletions

Applications/ApplicationsLib/ProjectData.cpp
MaterialLib/MPL/MaterialSpatialDistributionMap.cpp 35 additions, 1 deletion

MaterialLib/MPL/MaterialSpatialDistributionMap.cpp
Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4_anisotropic.prj 1 addition, 1 deletion

.../cube_1x1x1_SteadyStateDiffusion/cube_1e4_anisotropic.prj
Tests/Data/HydroMechanics/ExcavationNiches/excavation_niches.prj 1 addition, 1 deletion

...ata/HydroMechanics/ExcavationNiches/excavation_niches.prj
Tests/Data/Parabolic/LiquidFlow/RasterParameter/GroundwaterModelWithRasterBC.prj 1 addition, 1 deletion

...quidFlow/RasterParameter/GroundwaterModelWithRasterBC.prj
Tests/Data/ThermoHydroMechanics/HeatingHomogeneousDomain/hex_THM.prj 1 addition, 1 deletion

...ThermoHydroMechanics/HeatingHomogeneousDomain/hex_THM.prj

with 110 additions and 33 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment