From 8c36217e2606dafed48d453f01e5ba7de598400c Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Sat, 23 Jan 2021 12:02:41 +1100 Subject: [PATCH] Line ending git fix? --- .../ifcopenshell/express/DocAttribute.csv | 38 +++++++++--------- .../ifcopenshell/express/DocDefined.csv | 22 +++++----- .../ifcopenshell/express/DocEntity.csv | 32 +++++++-------- .../ifcopenshell/express/DocEnumeration.csv | 40 +++++++++---------- 4 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/ifcopenshell-python/ifcopenshell/express/DocAttribute.csv b/src/ifcopenshell-python/ifcopenshell/express/DocAttribute.csv index 5b8481230f..0853276dbc 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/DocAttribute.csv +++ b/src/ifcopenshell-python/ifcopenshell/express/DocAttribute.csv @@ -3172,11 +3172,11 @@ It may be human readable (such as a key) or not (such as a handle or uuid) depen " 3776;Name;Optional name to further specify the reference. It can provide a human readable identifier (which does not necessarily need to have a counterpart in the internal structure of the document). 3777;ExternalReferenceForResources;" -Reference to all associations between this external reference and objects within the IfcResourceObjectSelect that are tagged by the external reference. +Reference to all associations between this external reference and objects within the IfcResourceObjectSelect that are tagged by the external reference.
- -IFC2x4 CHANGE  New inverse attribute added with upward compatibility. + +IFC2x4 CHANGE  New inverse attribute added with upward compatibility.
@@ -3308,11 +3308,11 @@ The document information with which objects are associated. 3847;Name;

A name used to identify or qualify the relationship.

 3848;Description;

A description that may apply additional information about the relationship.

 3850;RelatingReference;" -An external reference that can be used to tag an object within the range of IfcResourceObjectSelect. +An external reference that can be used to tag an object within the range of IfcResourceObjectSelect.

- -NOTE  External references can be a library reference (for example a dictionary or a catalogue reference), a classification reference, or a documentation reference. + +NOTE  External references can be a library reference (for example a dictionary or a catalogue reference), a classification reference, or a documentation reference.

@@ -4613,15 +4613,15 @@ The line of the axis of revolution. The curve used to define the sweeping operation. The solid is generated by sweeping the SELF\IfcSweptAreaSolid.SweptArea along the Directrix. " 5372;StartParam;" -The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix.. -
-IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange. +The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix.. +
+IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
" 5373;EndParam;" -The parameter value on the Directrix at which the sweeping operation ends. If no value is provided the end of the sweeping operation is at the end of the Directrix.. -
-IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange. +The parameter value on the Directrix at which the sweeping operation ends. If no value is provided the end of the sweeping operation is at the end of the Directrix.. +
+IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
" 5374;ReferenceSurface;" @@ -4631,7 +4631,7 @@ The surface containing the Directrix. The curve used to define the sweeping operation. The solid is generated by sweeping the SELF\IfcSweptAreaSolid.SweptArea along the Directrix. " 5377;StartParam;" -The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix. +The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix. " 5378;EndParam;" The parameter value on the Directrix at which the sweeping operation ends. < style=""color:blue"">If no value is provided the end of the sweeping operation is at the end of the Directrix. @@ -4691,15 +4691,15 @@ The Radius of the circular disk to be swept along the directrix. D This attribute is optional, if present it defines the radius of a circular hole in the centre of the disk. " 5414;StartParam;" -The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix.. -
-IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange. +The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix.. +
+IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
" 5415;EndParam;" -The parameter value on the Directrix at which the sweeping operation ends. If no value is provided the end of the sweeping operation is at the end of the Directrix.. -
-IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange. +The parameter value on the Directrix at which the sweeping operation ends. If no value is provided the end of the sweeping operation is at the end of the Directrix.. +
+IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
" 5420;FilletRadius;" diff --git a/src/ifcopenshell-python/ifcopenshell/express/DocDefined.csv b/src/ifcopenshell-python/ifcopenshell/express/DocDefined.csv index 7e43a0f093..be57e315e9 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/DocDefined.csv +++ b/src/ifcopenshell-python/ifcopenshell/express/DocDefined.csv @@ -1826,22 +1826,22 @@ IFC2x3 CHANGE  The IfcBoxAlignment has been added. 5293;IfcGloballyUniqueId;"

An IfcGloballyUniqueId holds an encoded string identifier that is used to uniquely identify an IFC object. An IfcGloballyUniqueId is a Globally Unique Identifier (GUID) which is an auto-generated 128-bit number. Since this identifier is required for all IFC object instances, it is desirable to compress it to reduce overhead. The encoding of the base 64 character set is shown below: -

-
-

           1         2         3         4         5         6 -
 0123456789012345678901234567890123456789012345678901234567890123
- ""0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_$""; -

-
+

+
+

           1         2         3         4         5         6 +
 0123456789012345678901234567890123456789012345678901234567890123
+ ""0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_$""; +

+

The resulting string is a fixed 22 character length string to be exchanged within the IFC exchange file structure.

Refer to the BuildingSMART website (www.buildingsmart-tech.org) for more information and sample encoding algorithms.

-
-HISTORY  New type in IFC R1.5.1. -
- +
+HISTORY  New type in IFC R1.5.1. +
+ " 5463;IfcDimensionCount;" diff --git a/src/ifcopenshell-python/ifcopenshell/express/DocEntity.csv b/src/ifcopenshell-python/ifcopenshell/express/DocEntity.csv index 515fd8217e..7d26d1b8fe 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/DocEntity.csv +++ b/src/ifcopenshell-python/ifcopenshell/express/DocEntity.csv @@ -8904,8 +8904,8 @@ NOTE: The product representations are defined as representation maps (at the lev

A energy conversion type is used to define the common properties of a energy conversion device that may be applied to many occurrences of that type. -An energy conversion device is a building systems device that converts energy from one form into another such -as a boiler (i.e., combusting gas to heat water), chiller (i.e., using a refrigeration cycle to cool a +An energy conversion device is a building systems device that converts energy from one form into another such +as a boiler (i.e., combusting gas to heat water), chiller (i.e., using a refrigeration cycle to cool a liquid), or a cooling coil (i.e., using the phase-change characteristics of a refrigerant to cool air). Energy conversion types (or the instantiable subtypes) may be exchanged without being already assigned to occurrences.

@@ -8938,7 +8938,7 @@ liquid), or a cooling coil (i.e., using the phase-change characteristics of a re

A flow moving type is used to define the common properties of a flow moving device that may be applied to many occurrences of that type. -A flow moving device is a device that is used to produce a pressure differential in a distribution system, +A flow moving device is a device that is used to produce a pressure differential in a distribution system, such as a pump, fan, compressor, etc. Flow moving types (or the instantiable subtypes) may be exchanged without being already assigned to occurrences.

@@ -8971,8 +8971,8 @@ such as a pump, fan, compressor, etc.

A flow controller type is used to define the common properties of a flow controller that may be applied to many occurrences of that type. -A flow controller is a device that regulates flow within a distribution system, such as a valve in a piping -system, modulating damper in an air distribution system, or electrical switch in an electrical distribution +A flow controller is a device that regulates flow within a distribution system, such as a valve in a piping +system, modulating damper in an air distribution system, or electrical switch in an electrical distribution system. Flow controller types (or the instantiable subtypes) may be exchanged without being already assigned to occurrences.

@@ -9004,7 +9004,7 @@ system. Flow controller types (or the instantiable subtypes) may be exchanged

A flow segment type is used to define the common properties of a flow segment that may be applied to many occurrences of that type. -A flow segment is a section of a distribution system, such as a duct, pipe, conduit, etc. that typically has +A flow segment is a section of a distribution system, such as a duct, pipe, conduit, etc. that typically has only two ports. Flow segment types (or the instantiable subtypes) may be exchanged without being already assigned to occurrences.

@@ -9051,8 +9051,8 @@ only two ports.

A flow fitting type is used to define the common properties of a flow fitting that may be applied to many occurrences of that type. -A flow fitting is a device that is used to interconnect flow segments or other fittings within a distribution -system, such as a tee in a ducted system that branches flow into two directions, a junction box in an +A flow fitting is a device that is used to interconnect flow segments or other fittings within a distribution +system, such as a tee in a ducted system that branches flow into two directions, a junction box in an electrical distribution system, etc. Flow fitting types (or the instantiable subtypes) may be exchanged without being already assigned to occurrences.

@@ -9084,7 +9084,7 @@ HISTORY: New entity in IFC Release 2x2.
1123;IfcFlowTreatmentDeviceType;"

The element type IfcFlowTreatmentDeviceType defines a list of commonly shared property set definitions of a flow treatment device and an optional set of product representations. It is used to define a flow treatment device specification (the specific product information that is common to all occurrences of that product type).

-

A flow treatment device is a device used to change the physical properties of the medium, such as an air, oil +

A flow treatment device is a device used to change the physical properties of the medium, such as an air, oil or water filter (used to remove particulates from the fluid), or a duct silencer (used to attenuate noise). Flow treatment types (or the instantiable subtypes) may be exchanged without being already assigned to occurrences.

The occurrences of the IfcFlowTreatmentDeviceType are represented by instances of IfcFlowTreatmentDevice or its subtypes.

@@ -9418,7 +9418,7 @@ HISTORY: New entity in IFC R2x.

The distribution flow element IfcFlowStorageDevice defines the occurrence of a device that participates in a distribution system and is used for temporary storage of a fluid - such as a liquid or a gas (e.g., tank). Its type is defined by + such as a liquid or a gas (e.g., tank). Its type is defined by IfcFlowStorageDeviceType or its subtypes.

@@ -17685,8 +17685,8 @@ set for building system occurrences

An inventory is a list of items within an enterprise.

-

Various types of inventory can be included. These are identified by the range of values within the inventory type enumeration which includes space, asset, and furniture. User defined inventories can also be defined for lists of particular types of element such as may be required in operating and maintenance instructions. Such inventories should be constrained to contain a list of elements of a restricted type.

There are a number of actors that can be associated with an inventory, each actor having a role. Actors within the scope of the project are indicated using the IfcRelAssignsToActor relationship in which case roles should be defined through the IfcActorRole class; otherwise principal actors are identified as attributes of the class. In the existence of both, direct attributes take precedence.

There are a number of costs that can be associated with an inventory, each cost having a role. These are specified through the CurrentValue and OriginalValue attributes.

Various types of inventory can be included. These are identified by the range of values within the inventory type enumeration which includes space, asset, and furniture. User defined inventories can also be defined for lists of particular types of element such as may be required in operating and maintenance instructions. Such inventories should be constrained to contain a list of elements of a restricted type.

There are a number of actors that can be associated with an inventory, each actor having a role. Actors within the scope of the project are indicated using the IfcRelAssignsToActor relationship in which case roles should be defined through the IfcActorRole class; otherwise principal actors are identified as attributes of the class. In the existence of both, direct attributes take precedence.

There are a number of costs that can be associated with an inventory, each cost having a role. These are specified through the CurrentValue and OriginalValue attributes.

HISTORY: New entity in IFC2.0. Modified in IFC2x4 to make all attributes optional and remove Where Rule.

Assignment Use Definition

@@ -17704,8 +17704,8 @@ set for building system occurrences

An occupant is a type of actor that defines the form of occupancy of a property.

-

The principal purpose of IfcOccupant is to determine the nature of occupancy of a property for a particular actor. All characteristics relating to the actor (name and organization details) are inherited from the IfcActor class.

The principal purpose of IfcOccupant is to determine the nature of occupancy of a property for a particular actor. All characteristics relating to the actor (name and organization details) are inherited from the IfcActor class.

HISTORY: New entity in IFC2x

Assignment Use Definition

@@ -17749,8 +17749,8 @@ set for building system occurrences

Furniture defines complete furnishings such as a table, desk, chair, or cabinet, which may or may not be permanently attached to a building structure.

-

Occurrences of furniture that are built in (where the property Pset_FurnitureTypeCommon.IsBuiltIn is asserted to be TRUE) should have their connection relationship with a building element occurrence defined through the IfcRelConnectsElements relationship.

Occurrences of furniture that are built in (where the property Pset_FurnitureTypeCommon.IsBuiltIn is asserted to be TRUE) should have their connection relationship with a building element occurrence defined through the IfcRelConnectsElements relationship.

HISTORY: New entity in IFC2x2

Type Use Definition

diff --git a/src/ifcopenshell-python/ifcopenshell/express/DocEnumeration.csv b/src/ifcopenshell-python/ifcopenshell/express/DocEnumeration.csv index 36470a21f2..36c8403fd5 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/DocEnumeration.csv +++ b/src/ifcopenshell-python/ifcopenshell/express/DocEnumeration.csv @@ -4116,9 +4116,9 @@ HISTORY: New Enumeration in IFC Release 2.0. The IfcCoolingTowerTypeEnum contains the following:

  • NATURALDRAFT: Air flow is produced naturally.
    • -
  • MECHANICALINDUCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on +
  • MECHANICALINDUCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on the air outlet side of the cooling tower.
    • -
  • MECHANICALFORCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on +
  • MECHANICALFORCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on the inlet air side of the cooling tower.
  • USERDEFINED: User-defined cooling tower type.
  • NOTDEFINED: Undefined cooling tower type.
    • @@ -5033,12 +5033,12 @@ IFC2x4 CHANGE: Extended to include LOGICALXOR, LOGICALNOTAND and LOGICALNOTOR. LOGICALAND - Defines a relationship between operands whereby the result is true if all operands are true, i.e. false if at least + Defines a relationship between operands whereby the result is true if all operands are true, i.e. false if at least one operand is false. LOGICALOR - Defines a relationship between operands whereby the result is true if at least one operand is true, i.e false if + Defines a relationship between operands whereby the result is true if at least one operand is true, i.e false if all operands are false. @@ -5047,19 +5047,19 @@ all operands are false. LOGICALNOTAND - Defines a relationship between operands whereby the result is true if at least one operand is false, i.e false if + Defines a relationship between operands whereby the result is true if at least one operand is false, i.e false if all operands are true. LOGICALNOTOR - Defines a relationship between operands whereby the result is true if all operands are false, i.e false if at least + Defines a relationship between operands whereby the result is true if all operands are false, i.e false if at least one operand is true.

    Use Definition

    -

    The IfcLogicalOperatorEnum, when applied in a case of three operands, A, B and C, evaluates for each operator as +

    The IfcLogicalOperatorEnum, when applied in a case of three operands, A, B and C, evaluates for each operator as follows:

    @@ -5843,22 +5843,22 @@ IFC2x3 CHANGE  This concept was initially introduced in IFC 2.0 as IfcMo " 5269;IfcChangeActionEnum;" -

    IfcChangeActionEnum identifies the type of change that might have occurred to the object during the last session (for example, added, modified, deleted). This information is required in a partial model exchange scenario so that an application or model server will know how an object might have been affected by the previous application. Valid enumerations are:

    +

    IfcChangeActionEnum identifies the type of change that might have occurred to the object during the last session (for example, added, modified, deleted). This information is required in a partial model exchange scenario so that an application or model server will know how an object might have been affected by the previous application. Valid enumerations are:

    -
      -
    • NOCHANGE: Object has not been modified.
      • -
    • MODIFIED: A modification to the object has been made by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
      • -
    • ADDED: The object has been created by the user and application defined by the OwningUser and OwningApplication respectively.
      • -
    • DELETED: The object has been deleted by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
      • +
        +
      • NOCHANGE: Object has not been modified.
        • +
      • MODIFIED: A modification to the object has been made by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
        • +
      • ADDED: The object has been created by the user and application defined by the OwningUser and OwningApplication respectively.
        • +
      • DELETED: The object has been deleted by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
      • NOTDEFINED: The change action is not known or has not been defined.
        • -
      - -

      Consider Application A will create an IFC dataset that it wants to publish to others for modification and have the ability to subsequently merge these changes back into the original model. Before publication, it may want to set the IfcChangeActionEnum to NOCHANGE to establish a baseline so that other application changes can be easily identified. Application B then receives this IFC dataset and adds a new object and sets IfcChangeActionEnum to ADDED with Application B defined as the OwningApplication. Application B then modifies an existing object and (re)defines the LastModifiedDate to the time of the modification, LastModifyingUser to the IfcPersonAndOrganization making the change, and sets the LastModifyingApplication to Application B. When Application A receives this modified dataset, it can determine which objects have been added and modified by Application B and either merge or reject these changes as necessary. Consequently, the intent is that an application only modifies the value of IfcChangeActionEnum when it does something to the object, with the further intent that a model server is responsible for clearing the IfcChangeActionEnum back to NOCHANGE when it is ready to be republished.

      - -
      +
    + +

    Consider Application A will create an IFC dataset that it wants to publish to others for modification and have the ability to subsequently merge these changes back into the original model. Before publication, it may want to set the IfcChangeActionEnum to NOCHANGE to establish a baseline so that other application changes can be easily identified. Application B then receives this IFC dataset and adds a new object and sets IfcChangeActionEnum to ADDED with Application B defined as the OwningApplication. Application B then modifies an existing object and (re)defines the LastModifiedDate to the time of the modification, LastModifyingUser to the IfcPersonAndOrganization making the change, and sets the LastModifyingApplication to Application B. When Application A receives this modified dataset, it can determine which objects have been added and modified by Application B and either merge or reject these changes as necessary. Consequently, the intent is that an application only modifies the value of IfcChangeActionEnum when it does something to the object, with the further intent that a model server is responsible for clearing the IfcChangeActionEnum back to NOCHANGE when it is ready to be republished.

    + +
    HISTORY: New enumeration in IFC R2.0. Modified in IFC2x4. -
    - +
+ " 5452;IfcBooleanOperator;"

Definition from ISO/CD 10303-42:1992: This type defines the three Boolean operators used in the definition of CSG solids.