Skip to content

Commit

Permalink
Update measure type names for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
@dponti
dponti committed Dec 12, 2024
1 parent 80b46cd commit 2120edb
Show file tree
Hide file tree
Showing 7 changed files with 124 additions and 163 deletions.
13 changes: 1 addition & 12 deletions BetaProcedures.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,18 +452,7 @@
<complexContent>
<extension base="diggs:AbstractInsituTestProcedureType">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="reading">
<complexType>
<complexContent>
<extension base="eml:PressureMeasureExt">
<attribute name="trialNo" type="positiveInteger">
<annotation>
<documentation>Indicates the order of trials (eg. 1=the first trial, 2=the second trial, etc.)</documentation>
</annotation>
</attribute>
</extension>
</complexContent>
</complexType>
<element maxOccurs="unbounded" minOccurs="0" name="reading" type="diggs:ReadingMeasureType">
</element>
</sequence>
</extension>
Expand Down
133 changes: 49 additions & 84 deletions Construction.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
</annotation>
</element>
<element minOccurs="0" name="specificGravityMixDesign"
type="diggs:SpecificGravityType">
type="diggs:SpecificGravityMeasureType">
<annotation>
<documentation>Design value for grout specific gravity.</documentation>
</annotation>
Expand Down Expand Up @@ -664,19 +664,12 @@
<complexContent>
<extension base="diggs:AbstractObjectType">
<sequence>
<element minOccurs="0" name="apparentLugeonValue">
<element minOccurs="0" name="apparentLugeonValue" type="diggs:LugeonValueMeasureType">
<annotation>
<documentation>The apparent Lugeon value upon which injection should
terminate.</documentation>
</annotation>
<complexType>
<simpleContent>
<extension base="eml:AbstractMeasure">
<attribute fixed="Lu" name="uom" use="required"/>
</extension>
</simpleContent>
</complexType>
</element>
</element>
<element minOccurs="0" name="crossCommunication" type="boolean">
<annotation>
<documentation>Value is true if cross-communication of grout (eg. grout
Expand Down Expand Up @@ -710,35 +703,19 @@
termination.</documentation>
</annotation>
</element>
<element minOccurs="0" name="lateralMovement" maxOccurs="unbounded">
<element minOccurs="0" name="lateralMovement" maxOccurs="unbounded" type="diggs:MovementMeasureType">
<annotation>
<documentation>Amount of lateral movement that triggers injection
termination. Attribute 'displacedFeature' identifies feature being
monitored for movement.</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="eml:LengthMeasure">
<attribute name="displacedFeature"
type="diggs:TerminationFeatureExtEnumType"/>
</extension>
</complexContent>
</complexType>
</element>
<element minOccurs="0" name="movement" maxOccurs="unbounded">
<element minOccurs="0" name="movement" maxOccurs="unbounded" type="diggs:MovementMeasureType">
<annotation>
<documentation>Amount of total movement that triggers injection
termination. Attribute 'displacedFeature' identifies feature being
monitored for movement.</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="eml:LengthMeasure">
<attribute name="displacedFeature"
type="diggs:TerminationFeatureExtEnumType"/>
</extension>
</complexContent>
</complexType>
</element>
<element minOccurs="0" name="pressureLimit"
type="diggs:GroutPressureMeasureType" maxOccurs="unbounded">
Expand All @@ -750,55 +727,56 @@
(eg. pump, grout head, etc.).</documentation>
</annotation>
</element>
<element minOccurs="0" name="rotation" maxOccurs="unbounded">
<element minOccurs="0" name="rotation" maxOccurs="unbounded" type="diggs:RotationMeasureType">
<annotation>
<documentation>Amount of rotation that triggers injection termination.
Attribute 'displacedFeature' identifies feature being monitored for
movement.</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="eml:PlaneAngleMeasure">
<attribute name="displacedFeature"
type="diggs:TerminationFeatureExtEnumType"/>
</extension>
</complexContent>
</complexType>
</element>
<element minOccurs="0" name="tilt" maxOccurs="unbounded">
<element minOccurs="0" name="tilt" maxOccurs="unbounded" type="diggs:RotationMeasureType">
<annotation>
<documentation>Amount of tilt that triggers injection termination.
Attribute 'displacedFeature' identifies feature being monitored for
movement.</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="eml:PlaneAngleMeasure">
<attribute name="displacedFeature"
type="diggs:TerminationFeatureExtEnumType"/>
</extension>
</complexContent>
</complexType>
</element>
<element minOccurs="0" name="verticalMovement" maxOccurs="unbounded">
<element minOccurs="0" name="verticalMovement" maxOccurs="unbounded" type="diggs:MovementMeasureType">
<annotation>
<documentation>Amount of vertical movement that triggers injection
termination. Attribute 'displacedFeature' identifies feature being
monitored for movement.</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="eml:LengthMeasure">
<attribute name="displacedFeature"
type="diggs:TerminationFeatureExtEnumType"/>
</extension>
</complexContent>
</complexType>
</element>
</sequence>
</extension>
</complexContent>
</complexType>
<complexType name="MovementMeasureType">
<complexContent>
<extension base="eml:LengthMeasure">
<attribute name="displacedFeature"
type="diggs:TerminationFeatureExtEnumType"/>
</extension>
</complexContent>
</complexType>
<complexType name="RotationMeasureType">
<complexContent>
<extension base="eml:PlaneAngleMeasure">
<attribute name="displacedFeature"
type="diggs:TerminationFeatureExtEnumType"/>
</extension>
</complexContent>
</complexType>

<complexType name="LugeonValueMeasureType">
<simpleContent>
<extension base="eml:AbstractMeasure">
<attribute fixed="Lu" name="uom" use="required"/>
</extension>
</simpleContent>
</complexType>

<element name="GroutConstructionSpecification" type="diggs:GroutConstructionSpecificationType"
substitutionGroup="diggs:AbstractObject"/>
<complexType name="GroutConstructionSpecificationPropertyType" mixed="false">
Expand Down Expand Up @@ -1139,7 +1117,7 @@
<complexContent>
<extension base="diggs:AbstractNamedRoleObjectType">
<sequence>
<element minOccurs="0" name="specificGravity" type="diggs:SpecificGravityType">
<element minOccurs="0" name="specificGravity" type="diggs:SpecificGravityMeasureType">
<annotation>
<documentation>Specific gravity of grout component </documentation>
</annotation>
Expand Down Expand Up @@ -1947,20 +1925,13 @@
<documentation>Maximum capacity of the agitator.</documentation>
</annotation>
</element>
<element minOccurs="0" name="mixerVolume" maxOccurs="unbounded">
<element minOccurs="0" name="mixerVolume" maxOccurs="unbounded" type="diggs:MixerVolumeMeasureType">
<annotation>
<documentation>Maximum capacity of the mixer. The optional attribute
atSpecificGravity may be used to specify the maximum capacity of the
mixer for a particular specific gravity of the grout
</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="eml:VolumeMeasure">
<attribute name="atSpecificGravity" type="double"/>
</extension>
</complexContent>
</complexType>
</element>
<element minOccurs="0" name="agitatorSpeed" type="eml:AngularVelocityMeasure">
<annotation>
Expand All @@ -1976,6 +1947,14 @@
</extension>
</complexContent>
</complexType>
<complexType name="MixerVolumeMeasureType">
<complexContent>
<extension base="eml:VolumeMeasure">
<attribute name="atSpecificGravity" type="double"/>
</extension>
</complexContent>
</complexType>

<complexType name="TrialGroutBatchType">
<complexContent>
<extension base="diggs:AbstractSampleType">
Expand Down Expand Up @@ -2020,13 +1999,13 @@
</annotation>
</element>
<element minOccurs="0" name="specificGravityMix"
type="diggs:SpecificGravityType">
type="diggs:SpecificGravityMeasureType">
<annotation>
<documentation>The specific gravity of the grout mix</documentation>
</annotation>
</element>
<element minOccurs="0" name="specificGravityWater"
type="diggs:SpecificGravityType">
type="diggs:SpecificGravityMeasureType">
<annotation>
<documentation>The specific gravity of water used for mix
proportions,</documentation>
Expand Down Expand Up @@ -2186,7 +2165,7 @@
</annotation>
</element>
<element minOccurs="0" name="specificGravityOfSolids"
type="diggs:SpecificGravityType">
type="diggs:SpecificGravityMeasureType">
<annotation>
<documentation>Specific gravity of grout solids (Gs) is the ratio of the
density of a substance to the density of a reference substance,
Expand Down Expand Up @@ -2360,14 +2339,7 @@
interval filled.</documentation>
</annotation>
</element>
<element minOccurs="0" name="waterLugeonValue">
<complexType>
<simpleContent>
<extension base="eml:AbstractMeasure">
<attribute fixed="Lu" name="uom" use="required"/>
</extension>
</simpleContent>
</complexType>
<element minOccurs="0" name="waterLugeonValue" type="diggs:LugeonValueMeasureType">
</element>
<element maxOccurs="unbounded" minOccurs="0" name="groutTemperature"
type="diggs:TemperatureMeasurementtPropertyType">
Expand Down Expand Up @@ -3041,15 +3013,8 @@
interval.</documentation>
</annotation>
</element>
<element minOccurs="0" name="waterLugeonValue">
<complexType>
<simpleContent>
<extension base="eml:AbstractMeasure">
<attribute fixed="Lu" name="uom" use="required"/>
</extension>
</simpleContent>
</complexType>
</element>
<element minOccurs="0" name="waterLugeonValue" type="diggs:LugeonValueMeasureType">
</element>
<element minOccurs="0" name="filteringParameters" type="diggs:DiggsStringType">
<annotation>
<documentation>A description of any parameters used for filtering any
Expand Down
1 change: 1 addition & 0 deletions Diggs.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
<include schemaLocation="BetaProcedures.xsd"/>
<include schemaLocation="Deprecated.xsd"/>
<include schemaLocation="Diggs_procedures_temp.xsd"/>
<include schemaLocation="Piling.xsd"/>
<import namespace="http://diggsml.org/schemas/2.6/geotechnical" schemaLocation="Diggs_geo.xsd"/>
</schema>
15 changes: 9 additions & 6 deletions Diggs_geo_deprecated.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@
<extension base="diggs:AbstractEquipmentType">
<sequence>
<element minOccurs="0" name="loadCellCapacity" type="eml:ForceMeasureExt"/>
<element minOccurs="0" name="massOfTopPorousStone" type="diggs:DiggsMassMeasureType"/>
<element minOccurs="0" name="massOfTopPorousStone"
type="diggs:DiggsMassMeasureType"/>
<element minOccurs="0" name="massOfTopCap" type="diggs:DiggsMassMeasureType"/>
<element minOccurs="0" name="pistonDiameter" type="eml:LengthMeasureExt">
<annotation>
Expand Down Expand Up @@ -300,7 +301,7 @@
</annotation>
</element>
<element minOccurs="0" name="waterContentPostShear"
type="diggs:WaterContentType">
type="diggs:WaterContentMeasureType">
<annotation>
<documentation>Final moisture content after shearing is
completed</documentation>
Expand Down Expand Up @@ -710,9 +711,10 @@
</extension>
</complexContent>
</complexType>

<element abstract="false" name="ConsolidationTest"
substitutionGroup="diggs:AbstractLaboratoryTestProcedure" type="diggs_geo:ConsolidationTestType">
substitutionGroup="diggs:AbstractLaboratoryTestProcedure"
type="diggs_geo:ConsolidationTestType">
<annotation>
<documentation>An object describing a consolidation test procedure. This test is performed to determine the
magnitude and rate of volume decrease that a laterally confined soil specimen
Expand Down Expand Up @@ -827,7 +829,8 @@
</element>
<element minOccurs="0" name="estimatedPreConsolidationStress"
type="eml:PressureMeasure"/>
<element minOccurs="0" name="initialHeightChange" type="eml:LengthPerLengthMeasure">
<element minOccurs="0" name="initialHeightChange"
type="eml:LengthPerLengthMeasure">
<annotation>
<documentation>Height change of specimen on saturation, or flooding as
percentage of original height</documentation>
Expand All @@ -852,7 +855,7 @@
</extension>
</complexContent>
</complexType>



</schema>
Loading

0 comments on commit 2120edb

Please sign in to comment.