Skip to content

Commit

Permalink
Merge branch '1.0.0-beta5' of github.com:emmo-repo/EMMO into 1.0.0-beta5
Browse files Browse the repository at this point in the history
  • Loading branch information
@jesper-friis
jesper-friis committed Oct 29, 2023
2 parents 74a5260 + ca57780 commit acbf2bf
Show file tree
Hide file tree
Showing 10 changed files with 294 additions and 204 deletions.
3 changes: 2 additions & 1 deletion catalog-v001.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@

<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/metrology" uri="./disciplines/metrology.ttl"/>
<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/isq" uri="./disciplines/isq.ttl"/>

<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sisystem" uri="./disciplines/sisystem.ttl"/>

<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units" uri="./disciplines/units/units.ttl"/>
<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/sidimensionalunits" uri="./disciplines/units/sidimensionalunits.ttl"/>
<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits" uri="./disciplines/units/siunits.ttl"/>
<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits" uri="./disciplines/units/coherentsiunits.ttl"/>
Expand Down
3 changes: 2 additions & 1 deletion disciplines/catalog-v001.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/metrology" uri="../disciplines/metrology.ttl"/>
<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/isq" uri="../disciplines/isq.ttl"/>

<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sysystem" uri="../disciplines/sisystem.ttl"/>

<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units" uri="../disciplines/units/units.ttl"/>
<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/sidimensionalunits" uri="../disciplines/units/sidimensionalunits.ttl"/>
<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits" uri="../disciplines/units/siunits.ttl"/>
<uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits" uri="../disciplines/units/coherentsiunits.ttl"/>
Expand Down
2 changes: 1 addition & 1 deletion disciplines/disciplines.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<http://emmo.info/emmo/1.0.0-beta5/disciplines/periodictable> ,
<http://emmo.info/emmo/1.0.0-beta5/disciplines/sisystem> .

# Imported vis sisystem
# Imported via sisystem
# <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/sidimensionalunits> ,
# <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits> ,
# <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits> ,
Expand Down
12 changes: 10 additions & 2 deletions disciplines/isq.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1945,7 +1945,11 @@ pH = −10 log(a_OH-)"""@en ;

### http://emmo.info/emmo#EMMO_40989212_4866_41c0_8a20_84fd39540f29
:EMMO_40989212_4866_41c0_8a20_84fd39540f29 rdf:type owl:Class ;
rdfs:subClassOf :EMMO_066937f0_ea5c_4b06_8739_53f66d5ef89e ;
rdfs:subClassOf :EMMO_066937f0_ea5c_4b06_8739_53f66d5ef89e ,
[ rdf:type owl:Restriction ;
owl:onProperty :EMMO_bed1d005_b04e_4a90_94cf_02bc678a8569 ;
owl:someValuesFrom :EMMO_3227b821_26a5_4c7c_9c01_5c24483e0bd0
] ;
:EMMO_26bf1bef_d192_4da6_b0eb_d2209698fb54 "https://www.wikidata.org/wiki/Q11229788" ;
:EMMO_50c298c2_55a2_4068_b3ac_4e948c33181f "https://www.electropedia.org/iev/iev.nsf/display?openform&ievref=114-01-23" ;
:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "product of the ion activities of the ions resulting from the dissociation of a solute in a saturated solution, raised to powers equal to their stoichiometric numbers."@en ;
Expand Down Expand Up @@ -5263,7 +5267,11 @@ where g is the appropriate g factor, μ is mostly the Bohr magneton or nuclear m

### http://emmo.info/emmo#EMMO_b5523f03_5f2f_4e11_92c0_3734c6de3749
:EMMO_b5523f03_5f2f_4e11_92c0_3734c6de3749 rdf:type owl:Class ;
rdfs:subClassOf :EMMO_be76ad52_2e29_4202_be6f_0a15eb9c1817 ;
rdfs:subClassOf :EMMO_be76ad52_2e29_4202_be6f_0a15eb9c1817 ,
[ rdf:type owl:Restriction ;
owl:onProperty :EMMO_bed1d005_b04e_4a90_94cf_02bc678a8569 ;
owl:someValuesFrom :EMMO_b33cc5b5_a9dc_4082_b497_14d1654c5591
] ;
:EMMO_1f1b164d_ec6a_4faa_8d5e_88bda62316cc "https://qudt.org/vocab/quantitykind/KinematicViscosity" ;
:EMMO_26bf1bef_d192_4da6_b0eb_d2209698fb54 "https://www.wikidata.org/wiki/Q15106259" ;
:EMMO_50c298c2_55a2_4068_b3ac_4e948c33181f "https://www.electropedia.org/iev/iev.nsf/display?openform&ievref=113-03-35" ;
Expand Down
4 changes: 2 additions & 2 deletions disciplines/manufacturing.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ loose-powder sintering, gravity sintering: sintering of uncompacted powder"""@en
"""Powder:
particles that are usually less than 1 mm in size""" ;
rdfs:comment "da una forma non propria ad una forma propria" ;
skos:prefLabel "fromNotProperShapeToWorkPiece"@en .
skos:prefLabel "FromNotProperShapeToWorkPiece"@en .


### http://emmo.info/emmo#EMMO_46dc0d51_b60f_49cd_8650_9aba7be3726c
Expand Down Expand Up @@ -1822,7 +1822,7 @@ manufacturing process: set of processes in manufacturing involving a flow and/or
### http://emmo.info/emmo#EMMO_fc86c700_ccea_441c_b628_ad236f030fe6
:EMMO_fc86c700_ccea_441c_b628_ad236f030fe6 rdf:type owl:Class ;
rdfs:subClassOf :EMMO_dd4b7d81_28a9_4801_8831_4cbab217e362 ;
skos:prefLabel "fromWorkPIecetoWorkPiece"@en .
skos:prefLabel "FromWorkPIecetoWorkPiece"@en .


### Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi
Loading

0 comments on commit acbf2bf

Please sign in to comment.