Merge pull request #260 from FAIRmat-NFDI/sprint22_clear_duplicates_f…

…or_circuits

Cleaned the too many base classes for circuits and cleaned base classes for describing a computer

contributed_definitions/NXcs_computer.nxdl.xml

@@ -22,13 +22,8 @@
 # For further information, see http://www.nexusformat.org
 -->
 <definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" type="group" name="NXcs_computer" extends="NXobject" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
-    <symbols>
-        <doc>
-             The symbols used in the schema to specify e.g. dimensions of arrays.
-        </doc>
-    </symbols>
     <doc>
-         Computer science description of a set of computing nodes.
+         Base class for reporting the description of a computer
     </doc>
     <field name="name" type="NX_CHAR">
         <doc>
@@ -57,24 +52,95 @@
         </doc>
     </field>
     <!--when it comes to performance monitoring-->
-    <group type="NXcs_cpu_sys">
-        <doc>
-             Details about (classical) processing units (CPUs) or a system thereof.
-        </doc>
-    </group>
-    <group type="NXcs_gpu_sys">
+    <group name="processing" type="NXobject">
         <doc>
-             Details about coprocessor/graphic cards/accelerator units or a system thereof.
+             Details about the system of processing units e.g. (classical) processing units (CPUs),
+             coprocessor, graphic cards, accelerator processing units or a system of these.
         </doc>
+        <group type="NXcircuit">
+            <doc>
+                 Granularizing the processing units. Typical examples, a desktop computer
+                 with a single CPU one could describe using one instance of NXcircuit.
+                 A dual-socket server one could describe using two instances NXcircuit
+                 A server with two dual-socket server nodes one could describe with
+                 four instances of NXcircuit surplus a field with their level in the hierarchy.
+            </doc>
+            <field name="type" type="NX_CHAR">
+                <doc>
+                     General type of the processing unit
+                </doc>
+                <enumeration>
+                    <item value="cpu"/>
+                    <item value="gpu"/>
+                    <item value="fpga"/>
+                    <item value="other"/>
+                </enumeration>
+            </field>
+            <field name="name" type="NX_CHAR">
+                <doc>
+                     Given name
+                </doc>
+            </field>
+        </group>
     </group>
-    <group type="NXcs_mm_sys">
+    <group name="memory" type="NXobject">
         <doc>
-             Details about the memory sub-system.
+             Details about the memory system.
         </doc>
+        <group type="NXcircuit">
+            <doc>
+                 Granularizing the components of the memory system.
+            </doc>
+            <field name="type" type="NX_CHAR">
+                <doc>
+                     Qualifier for the type of random access memory.
+                </doc>
+                <enumeration>
+                    <item value="ddr4"/>
+                    <item value="ddr5"/>
+                </enumeration>
+            </field>
+            <field name="max_physical_capacity" type="NX_POSINT" units="NX_ANY">
+                <doc>
+                     Total amount of data which the medium can hold.
+                </doc>
+            </field>
+            <field name="name" type="NX_CHAR">
+                <doc>
+                     Given name
+                </doc>
+            </field>
+        </group>
     </group>
-    <group type="NXcs_io_sys">
+    <group name="storage" type="NXobject">
         <doc>
-             Details about the I/O sub-system.
+             Details about the I/O system.
         </doc>
+        <group type="NXcircuit">
+            <doc>
+                 Granularizing the components of the I/O system.
+            </doc>
+            <field name="type" type="NX_CHAR">
+                <doc>
+                     Qualifier for the type of storage medium used.
+                </doc>
+                <enumeration>
+                    <item value="solid_state_disk"/>
+                    <item value="hard_disk"/>
+                    <item value="tape"/>
+                </enumeration>
+            </field>
+            <field name="max_physical_capacity" type="NX_POSINT" units="NX_ANY">
+                <doc>
+                     Total amount of data which the medium can hold.
+                </doc>
+            </field>
+            <field name="name" type="NX_CHAR">
+                <doc>
+                     Given name
+                </doc>
+            </field>
+        </group>
     </group>
+    <!--NXcircuit inherits fabrication from NXcomponent-->
 </definition>