Skip to content

Commit

Permalink
[New Model]: Secondary Material Content (split into shared, calculate…
Browse files Browse the repository at this point in the history
…d, verifiable) (#506)

* split of secondary material content aspect into calculated, verifiable and shared (as basis)

content changes:
-	Separate post consumer and post consumer automotive
-	Mass-balancing option for mechanical recycling
-	Add gross material input weight (Bruttomaterialeinsatzgewicht)

* changed release notes

* fixed errors and wrong versioning

* changes to samm unit: percent
added description to trait

* @en added

* Update to 2.1.0

* chore: updated MS3 approval date and fixed shared aspect model version to 1.0.0

---------

Co-authored-by: --show-origin <[email protected]>
  • Loading branch information
catroest and tom-rm-meyer-ISST authored Dec 18, 2023
1 parent 07f378d commit 8c67968
Show file tree
Hide file tree
Showing 9 changed files with 537 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#######################################################################
# Copyright (c) 2023 BMW AG
# Copyright (c) 2023 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V. (represented by Fraunhofer IPK)
# Copyright (c) 2023 BASF SE
# Copyright (c) 2023 SAP Deutschland SE & Co.KG
# Copyright (c) 2023 T-Systems International GmbH
# Copyright (c) 2023 Robert Bosch GmbH
# Copyright (c) 2023 tec4U-Ingenieurgesellschaft mbH
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This work is made available under the terms of the
# Creative Commons Attribution 4.0 International (CC-BY-4.0) license,
# which is available at
# https://creativecommons.org/licenses/by/4.0/legalcode.
#
# SPDX-License-Identifier: CC-BY-4.0
#######################################################################

@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <urn:samm:io.catenax.secondary_material_content_calculated:1.0.0#> .
@prefix ext-content: <urn:samm:io.catenax.shared.secondary_material_content:1.0.0#> .

:SecondaryMaterialContentCalculated a samm:Aspect ;
samm:preferredName "Secondary Material Content Calculated"@en ;
samm:description "This model refers to a planned or designed part containing one or more different materials. It references the assumed/calculated share on primary and secondary materials and relevant details."@en ;
samm:properties ( ext-content:secondaryMaterialContent ext-content:orderNumber ) ;
samm:operations ( ) ;
samm:events ( ) .

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "status" : "release"}
15 changes: 15 additions & 0 deletions io.catenax.secondary_material_content_calculated/RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Changelog
All notable changes to this model will be documented in this file.

## [Unreleased]

## [1.0.0] - 2023-12-18
### Added
- initial model
- reference to shared aspect

### Changed
n/a

### Removed

Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#######################################################################
# Copyright (c) 2023 BMW AG
# Copyright (c) 2023 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V. (represented by Fraunhofer IPK)
# Copyright (c) 2023 BASF SE
# Copyright (c) 2023 SAP Deutschland SE & Co.KG
# Copyright (c) 2023 T-Systems International GmbH
# Copyright (c) 2023 Robert Bosch GmbH
# Copyright (c) 2023 tec4U-Ingenieurgesellschaft mbH
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This work is made available under the terms of the
# Creative Commons Attribution 4.0 International (CC-BY-4.0) license,
# which is available at
# https://creativecommons.org/licenses/by/4.0/legalcode.
#
# SPDX-License-Identifier: CC-BY-4.0
#######################################################################

@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <urn:samm:io.catenax.secondary_material_content_verifiable:1.0.0#> .
@prefix ext-content: <urn:samm:io.catenax.shared.secondary_material_content:1.0.0#> .

:SecondaryMaterialContentVerifiable a samm:Aspect ;
samm:preferredName "Secondary Material Content Verifiable"@en ;
samm:description "This model refers to a built part containing one or more different materials. It references the actual share on primary and secondary materials and relevant details."@en ;
samm:properties ( ext-content:secondaryMaterialContent ext-content:orderNumber ) ;
samm:operations ( ) ;
samm:events ( ) .

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "status" : "release"}
15 changes: 15 additions & 0 deletions io.catenax.secondary_material_content_verifiable/RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Changelog
All notable changes to this model will be documented in this file.

## [Unreleased]

## [1.0.0] - 2023-12-18
### Added
- initial model
- reference to shared aspect

### Changed
n/a

### Removed

Loading

0 comments on commit 8c67968

Please sign in to comment.