@memoarchitect/ontology 0.7.0 → 0.8.24

package/examples/gpca-pump/model/catalog/gpca_verification.sysml

@@ -1,8 +1,16 @@
 package memo_examples_gpca_pump_gpca_verification {
+    private import memo_examples_gpca_pump_gpca_requirements::*;
+    private import memo_examples_gpca_pump_gpca_formal_behavior::*;
+    private import memo_examples_gpca_pump_gpca_architecture::*;
+    private import memo_examples_gpca_pump_gpca_risk::*;
+    private import memo_examples_gpca_pump_gpca_behavior_modes::*;
+    private import memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_requirements_view::*;
     private import ScalarValues::*;
+    private import memo_core_dimensions::*;   // ElementStatusKind
 
     private import memo_assurance_verification_validation::*;
     private import memo_core_enumerations::*;
+    private import memo_core_common::*;
 
     // ── Verification cases ──────────────────────────────────────
     verification vcModeRange : VerificationCase {
@@ -10,112 +18,155 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> name = "VerifyModeRange";
         attribute :>> methodKind = VerificationMethodKind::formalProof;
         attribute :>> acceptanceCriteria = "Current_System_mode only takes valid exclusive values";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqCs01; }
+        subject verified : Base::Anything[*] = (guaranteeExclusiveMode, gpcaDevice.gpcaSoftware.tlm, gpcaDevice.gpcaSoftware.outputBus);
     }
     verification vcLockout : VerificationCase {
         attribute :>> id = "VER-002";
         attribute :>> name = "VerifyBolusLockout";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "No patient bolus initiated when lockout or max bolus constraints active";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqCs25; }
+        subject verified : Base::Anything[*] = (lockoutControl, guaranteeLockoutPreventsBolus, tcBolusResponse, gpcaDevice.gpcaSoftware.infusionMgr);
     }
     verification vcSameStepAlarm : VerificationCase {
         attribute :>> id = "VER-003";
         attribute :>> name = "VerifySameStepAlarmStop";
         attribute :>> methodKind = VerificationMethodKind::modelChecking;
         attribute :>> acceptanceCriteria = "Alarm output affects infusion in same execution step";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqCs19; }
+        subject verified : Base::Anything[*] = (propAlarmStopsSameStep, guaranteeAlarmStopsSameStep, tcAlarmLatency, gpcaDevice.gpcaSoftware.alarm);
     }
     verification vcTemporalModeSafety : VerificationCase {
         attribute :>> id = "VER-004";
         attribute :>> name = "VerifyTemporalModeSafety";
         attribute :>> methodKind = VerificationMethodKind::modelChecking;
         attribute :>> acceptanceCriteria = "No invalid transitions and pause on critical alarms";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqCs75; verify reqDoorOpen; }
+        subject verified : Base::Anything[*] = (propLockoutTimerMonotonic, temporalNoInvalidTransition);
     }
     verification vcAirInLine : VerificationCase {
         attribute :>> id = "VER-005";
         attribute :>> name = "VerifyAirInLineStop";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Injected air above threshold pauses infusion and annunciates per the REQ 59 High-priority actions (REQ-CS-21)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqCs21; }
+        subject verified : Base::Anything[*] = (airDetectionControl);
     }
     verification vcOcclusion : VerificationCase {
         attribute :>> id = "VER-006";
         attribute :>> name = "VerifyOcclusionDetection";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Clamped line above pressure threshold pauses infusion and annunciates (REQ-X-04)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqOcclusion; }
+        subject verified : Base::Anything[*] = (occlusionAlarmControl);
     }
     verification vcEmptyReservoir : VerificationCase {
         attribute :>> id = "VER-007";
         attribute :>> name = "VerifyEmptyReservoirStop";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Reservoir-empty assertion transitions to PAUSED (KVO flow) and annunciates per the REQ 59 High-priority actions (REQ-CS-23)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqCs23; }
+        subject verified : Base::Anything[*] = (reservoirMonitorControl, gpcaDevice.gpcaSoftware.systemStatus);
     }
     verification vcPost : VerificationCase {
         attribute :>> id = "VER-008";
         attribute :>> name = "VerifyPowerOnSelfTest";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Each injected POST fault (CPU, RAM, ROM, watchdog, sensors) blocks therapy and alarms (REQ-X-02)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqPost; }
+        subject verified : Base::Anything[*] = (gpcaDevice.gpcaSoftware.systemMonitor);
     }
     verification vcPowerLoss : VerificationCase {
         attribute :>> id = "VER-009";
         attribute :>> name = "VerifyPowerLossRetentionAndResume";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Prescription and log intact after power cycle; therapy resumes only after confirmation (REQ-X-03)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqPowerLossRetention; verify reqBatteryBackup; }
     }
     verification vcWatchdog : VerificationCase {
         attribute :>> id = "VER-010";
         attribute :>> name = "VerifyWatchdogSafeState";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Induced CPU hang forces zero flow and continuous alarm within 60 ms (REQ-X-08, TC-003)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqWatchdogSafeState; }
+        subject verified : Base::Anything[*] = (watchdogControl, tcWatchdogTimeout);
     }
     verification vcHourlyMax : VerificationCase {
         attribute :>> id = "VER-011";
         attribute :>> name = "VerifyHourlyDoseCeiling";
         attribute :>> methodKind = VerificationMethodKind::simulation;
         attribute :>> acceptanceCriteria = "Randomized bolus/basal schedules never exceed hourly maximum in sliding window (REQ-X-06)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqMaxHourlyDose; }
     }
     verification vcPumpAccuracy : VerificationCase {
         attribute :>> id = "VER-012";
         attribute :>> name = "VerifyDeliveryAccuracy";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Gravimetric bench measurement within ±5% (Tolerance_Min_const) across rate range (REQ-X-11)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqPumpAccuracy; }
     }
     verification vcAlarmLoudness : VerificationCase {
         attribute :>> id = "VER-013";
         attribute :>> name = "VerifyAlarmSoundPressure";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Each priority tone meets Audio_level_const, 50 db for 2 s per I 8 (REQ-X-12)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqCs72; verify reqAlarmLoudness; }
     }
     verification vcFreeFlow : VerificationCase {
         attribute :>> id = "VER-014";
         attribute :>> name = "VerifyAntiFreeFlowValve";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "No gravity flow with set disengaged under worst-case head height (REQ-X-14)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqFreeFlowPrevention; }
+        subject verified : Base::Anything[*] = (freeFlowValveControl);
     }
     verification vcStuckButton : VerificationCase {
         attribute :>> id = "VER-015";
         attribute :>> name = "VerifyStuckButtonDetection";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Shorted pendant input yields no bolus and Medium-priority notification after 60 s (REQ-X-09)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqStuckButton; }
     }
     verification vcFlowCrossCheck : VerificationCase {
         attribute :>> id = "VER-016";
         attribute :>> name = "VerifyFlowCrossCheck";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Injected deviation beyond Tolerance_Min_const sustained past Max_Duration_OverInfusion_const pauses therapy and annunciates (REQ-X-10)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqFlowCrossCheck; }
+        subject verified : Base::Anything[*] = (flowCrossCheckControl);
     }
 
     verification vcDrugLibrary : VerificationCase {
@@ -123,56 +174,74 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> name = "VerifyDrugLibraryEnforcement";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Hard-limit entries rejected, soft-limit entries require confirmation, both logged (REQ-X-01)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqDrugLibraryLimits; }
+        subject verified : Base::Anything[*] = (drugLibraryControl, gpcaDevice.gpcaSoftware.config);
     }
     verification vcPrescriptionConfirm : VerificationCase {
         attribute :>> id = "VER-018";
         attribute :>> name = "VerifyPrescriptionConfirmation";
         attribute :>> methodKind = VerificationMethodKind::demonstration;
         attribute :>> acceptanceCriteria = "Therapy cannot start without distinct confirmation; displayed values equal stored values (REQ-CS-09)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqCs09; }
     }
     verification vcEventLog : VerificationCase {
         attribute :>> id = "VER-019";
         attribute :>> name = "VerifyEventLogIntegrity";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Operational/error log entries per REQ-CS-78..81; tampering detectable (REQ-X-07)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        objective { verify reqCs78; verify reqEventLogging; }
+        subject verified : Base::Anything[*] = (gpcaDevice.gpcaSoftware.logging);
     }
     verification vcReverseDeliveryPause : VerificationCase {
         attribute :>> id = "VER-020";
         attribute :>> name = "VerifyReverseDeliveryPause";
         attribute :>> methodKind = VerificationMethodKind::modelChecking;
         attribute :>> acceptanceCriteria = "Continuous or cumulative reverse delivery beyond the REQ-CS-22 duration limits transitions to PAUSED and raises the Reverse Delivery notification (NOTIF-04)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        subject verified : Base::Anything[*] = (reverseDeliveryPauseControl);
     }
     verification vcAntiRefluxMechanism : VerificationCase {
         attribute :>> id = "VER-021";
         attribute :>> name = "VerifyContinuousReverseDeliveryPrevention";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "During normal use and single fault condition, continuous reverse delivery is not possible (IEC 601-2-24 basis per GPCA safety requirements)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        subject verified : Base::Anything[*] = (antiRefluxDesignControl);
     }
     verification vcVtbiCeiling : VerificationCase {
         attribute :>> id = "VER-022";
         attribute :>> name = "VerifyVtbiCeilingPause";
         attribute :>> methodKind = VerificationMethodKind::modelChecking;
         attribute :>> acceptanceCriteria = "Actual volume infused above the drug-database maximum VTBI transitions to PAUSED with flow at most KVO (REQ-CS-20, AGREE GP-008) and raises NOTIF-06";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        subject verified : Base::Anything[*] = (vtbiLimitPauseControl);
     }
     verification vcInfusionComplete : VerificationCase {
         attribute :>> id = "VER-023";
         attribute :>> name = "VerifyInfusionCompleteStop";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Reaching prescribed total duration or maximum VTBI transitions ACTIVE to IDLE with Infusion Complete actions (REQ-CS-28)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        subject verified : Base::Anything[*] = (infusionCompleteControl);
     }
     verification vcDoorInterlock : VerificationCase {
         attribute :>> id = "VER-024";
         attribute :>> name = "VerifyDoorOpenDeliveryInhibit";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Door open during THERAPY limits flow to at most KVO and raises a notification (AGREE GP-011; REQ-X-05)";
-        attribute :>> status = "planned";
+        attribute :>> status = ElementStatusKind::approved;
+
+        subject verified : Base::Anything[*] = (doorInterlockControl);
     }
 
     // ── Validation cases (design validation / IEC 62366) ────────
@@ -194,7 +263,8 @@ package memo_examples_gpca_pump_gpca_verification {
     }
 
     // ── Test artifacts and evidence ─────────────────────────────
-    part testReportLockout : TestArtifact {
+    part testReportLockout : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::testArtifact;
         attribute :>> id = "TEST-001";
         attribute :>> name = "BolusLockoutTestReport";
         attribute :>> version = "0.1";
@@ -202,7 +272,8 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> artifactKind = ArtifactKind::testReport;
         attribute :>> resultSummary = "planned";
     }
-    part testProtocolSafetySuite : TestArtifact {
+    part testProtocolSafetySuite : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::testArtifact;
         attribute :>> id = "TEST-002";
         attribute :>> name = "SafetyAlarmTestProtocol";
         attribute :>> version = "0.1";
@@ -210,7 +281,8 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> artifactKind = ArtifactKind::testProtocol;
         attribute :>> resultSummary = "covers VER-005..VER-010, VER-015, VER-016, VER-020, VER-022..VER-024";
     }
-    part evidenceLockout : Evidence {
+    part evidenceLockout : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::evidence;
         attribute :>> id = "EVD-001";
         attribute :>> name = "BolusLockoutEvidence";
         attribute :>> version = "0.1";
@@ -218,7 +290,8 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> evidenceType = "verification evidence";
         attribute :>> integrityStatus = "draft";
     }
-    part evidenceModeRange : Evidence {
+    part evidenceModeRange : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::evidence;
         attribute :>> id = "EVD-002";
         attribute :>> name = "ModeRangeEvidence";
         attribute :>> version = "0.1";
@@ -226,7 +299,8 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> evidenceType = "formal proof evidence";
         attribute :>> integrityStatus = "draft";
     }
-    part evidenceSameStepAlarm : Evidence {
+    part evidenceSameStepAlarm : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::evidence;
         attribute :>> id = "EVD-003";
         attribute :>> name = "SameStepAlarmEvidence";
         attribute :>> version = "0.1";
@@ -234,7 +308,8 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> evidenceType = "model checking evidence";
         attribute :>> integrityStatus = "draft";
     }
-    part evidenceTemporalModeSafety : Evidence {
+    part evidenceTemporalModeSafety : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::evidence;
         attribute :>> id = "EVD-004";
         attribute :>> name = "TemporalModeSafetyEvidence";
         attribute :>> version = "0.1";
@@ -242,7 +317,8 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> evidenceType = "model checking evidence";
         attribute :>> integrityStatus = "draft";
     }
-    part evidenceSafetyAlarmSuite : Evidence {
+    part evidenceSafetyAlarmSuite : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::evidence;
         attribute :>> id = "EVD-005";
         attribute :>> name = "SafetyAlarmSuiteEvidence";
         attribute :>> version = "0.1";
@@ -250,7 +326,8 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> evidenceType = "bench test evidence for alarm-driven safe states";
         attribute :>> integrityStatus = "draft";
     }
-    part evidenceUsability : Evidence {
+    part evidenceUsability : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::evidence;
         attribute :>> id = "EVD-006";
         attribute :>> name = "SummativeUsabilityEvidence";
         attribute :>> version = "0.1";
@@ -258,7 +335,8 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> evidenceType = "summative usability report per IEC 62366-1";
         attribute :>> integrityStatus = "draft";
     }
-    part evidenceHardwareBench : Evidence {
+    part evidenceHardwareBench : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::evidence;
         attribute :>> id = "EVD-008";
         attribute :>> name = "HardwareBenchEvidence";
         attribute :>> version = "0.1";
@@ -266,7 +344,8 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> evidenceType = "bench evidence for alarm loudness and anti-free-flow valve";
         attribute :>> integrityStatus = "draft";
     }
-    part evidenceDoseProgramming : Evidence {
+    part evidenceDoseProgramming : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::evidence;
         attribute :>> id = "EVD-009";
         attribute :>> name = "DoseProgrammingEvidence";
         attribute :>> version = "0.1";
@@ -274,7 +353,8 @@ package memo_examples_gpca_pump_gpca_verification {
         attribute :>> evidenceType = "test evidence for prescription limits, confirmation, dose ceiling, and event log";
         attribute :>> integrityStatus = "draft";
     }
-    part evidenceDeliveryAccuracy : Evidence {
+    part evidenceDeliveryAccuracy : MemoEvidence {
+        attribute :>> evidenceKind = EvidenceKind::evidence;
         attribute :>> id = "EVD-007";
         attribute :>> name = "DeliveryAccuracyEvidence";
         attribute :>> version = "0.1";

package/examples/gpca-pump/model/catalog/project.sysml

@@ -17,5 +17,10 @@ package memo_examples_gpca_pump_project {
         ref :>> selectedMethodology = gpcaMethodDefinition;
         // The project adds nothing to the methodology's selection.
         attribute :>> scopeMode = ScopeModeKind::explicit;
+        // The submission regimes this device targets. `memo standards check`
+        // reads this to decide which standards are required: an EU + US launch
+        // pulls in both the harmonised IEC/ISO packs and 21 CFR Part 820,
+        // where a CE-only project would not be asked for the FDA clauses.
+        attribute :>> regulatoryRegime = (RegulatoryRegimeKind::CE, RegulatoryRegimeKind::MDR, RegulatoryRegimeKind::FDA_510k);
     }
 }

package/examples/gpca-pump/model/catalog/viewpoints/context/views/context_system_context_view.sysml

@@ -18,7 +18,6 @@ package memo_examples_gpca_pump_viewpoints_context_views_context_system_context_
         attribute depth = 2;
         attribute :>> id = "VIEW-CTX-101";
         attribute :>> name = "GPCA_SystemContextView";
-        attribute :>> title = "GPCA System Context View";
         attribute :>> shortDescription = "Actors, use contexts, and external entities at the GPCA system boundary.";
         attribute :>> description = "Shows the CriSys Fig 2.1 boundary: patient, clinician, prescription, drug reservoir, needle, hospital pharmacy database, and hospital environment around the pump, with directional data flows, physical drug-path connections, and the intended use anchoring the boundary.";
         attribute :>> outputKind = (ViewOutputKind::diagram);
@@ -28,16 +27,15 @@ package memo_examples_gpca_pump_viewpoints_context_views_context_system_context_
         attribute :>> dataSourceDescription = "GPCA context layer: actors, use contexts, intended use, operational entities";
         attribute :>> autoPopulate = true;
         attribute :>> queryDescription = "Include actors, use contexts, intended use, and external operational entities.";
-        attribute :>> documentUsage = ("Architecture Description", "Usability Engineering File");
         part :>> selectionQuery {
             attribute :>> id = "QRY-CTX-101";
             attribute :>> name = "GPCA_SystemContextQuery";
             attribute :>> includeElementKinds = ("Actor", "UseContext", "IntendedUse", "ReasonablyForeseeableMisuse", "OperationalEntity");
-            attribute :>> includeRelationshipKinds = ("InteractsWith", "ExchangesWith", "ConnectsPhysically", "Governs", "AppliesInContext");
+            attribute :>> includeRelationshipKinds = ("InteractsWith", "flow", "connect", "Governs", "AppliesInContext");
             attribute :>> includeLayers = ("context", "operational");
             attribute :>> selectionExpression = "product == 'GPCA'";
             attribute :>> rationaleText = "Auto-populate the GPCA context view from the context layer.";
         }
-        part :>> viewpointDefinition = contextViewpoint;
+        ref :>> viewpointDefinition = contextViewpoint;
     }
 }

package/examples/gpca-pump/model/catalog/viewpoints/cybersecurity/views/cybersecurity_cybersecurity_view.sysml

@@ -19,7 +19,6 @@ package memo_examples_gpca_pump_viewpoints_cybersecurity_views_cybersecurity_cyb
         attribute depth = 2;
         attribute :>> id = "VIEW-CYB-001";
         attribute :>> name = "GPCA_CybersecurityView";
-        attribute :>> title = "GPCA Cybersecurity View";
         attribute :>> shortDescription = "Shows GPCA assets, trust boundaries, threats, vulnerabilities, and mitigations.";
         attribute :>> description = "Product-specific cybersecurity view intended for secure product development and cross-reference into cybersecurity risk documentation.";
         attribute :>> outputKind = (ViewOutputKind::diagram);
@@ -29,16 +28,15 @@ package memo_examples_gpca_pump_viewpoints_cybersecurity_views_cybersecurity_cyb
         attribute :>> dataSourceDescription = "GPCA cyber assets, threat scenarios, and trace links";
         attribute :>> autoPopulate = true;
         attribute :>> queryDescription = "Include cyber assets, trust boundaries, threats, vulnerabilities, cyber hazards, cyber risks, mitigations, security requirements, and verification.";
-        attribute :>> documentUsage = ("Threat Model", "Cybersecurity Risk Assessment", "QMSR");
         part :>> selectionQuery {
             attribute :>> id = "QRY-CYB-001";
             attribute :>> name = "GPCA_CybersecurityQuery";
-            attribute :>> includeElementKinds = ("CybersecurityAsset", "Threat", "Vulnerability", "CyberHazard", "CyberRisk", "CyberMitigation", "SecurityRequirement", "TrustBoundary", "ThreatScenario");
+            attribute :>> includeElementKinds = ("CybersecurityAsset", "Threat", "Vulnerability", "CyberHazard", "CyberRisk", "CyberMitigation", "SecurityRequirement", "TrustBoundary", "OperativeScenario[scenarioKind=threat]");
             attribute :>> includeLayers = ("cybersecurity", "risk", "assurance");
             attribute :>> includeConcerns = (ConcernKind::cybersecurity, ConcernKind::privacy, ConcernKind::safety);
             attribute :>> selectionExpression = "product == 'GPCA'";
             attribute :>> rationaleText = "Auto-populate the GPCA cybersecurity view from the cyber layer and cross-layer trace model.";
         }
-        part :>> viewpointDefinition = cybersecurityViewpoint;
+        ref :>> viewpointDefinition = cybersecurityViewpoint;
     }
 }

package/examples/gpca-pump/model/catalog/viewpoints/cybersecurity/views/document_cyber_assessment_view.sysml

@@ -10,15 +10,12 @@ package memo_examples_gpca_pump_viewpoints_cybersecurity_views_document_cyber_as
         expose memo_examples_gpca_pump_viewpoints_cybersecurity_views_document_cyber_assessment_view::*;
         attribute :>> id = "DOC-003";
         attribute :>> name = "GPCAMemoCybersecurityAssessmentView";
-        attribute :>> title = "GPCA Cybersecurity Assessment View";
         attribute :>> shortDescription = "Cybersecurity risk-assessment-oriented document view for GPCA.";
         attribute :>> description = "Captures GPCA cyber risks, mitigations, security requirements, verification, and safety/privacy traceability for cybersecurity assessment records.";
         attribute :>> version = "0.1";
         attribute :>> lifecycleState = LifecycleStateKind::development;
         attribute :>> marketScope = "generic";
-        attribute :>> documentUsage = ("Cybersecurity Risk Assessment", "RMF", "QMSR");
-        attribute :>> sectionIdentifier = "CYB-RA";
-        part :>> viewpointDefinition = cybersecurityViewpoint;
+        ref :>> viewpointDefinition = cybersecurityViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-009";
             attribute :>> name = "cyberAssessmentViewQuery";

package/examples/gpca-pump/model/catalog/viewpoints/cybersecurity/views/document_threat_model_view.sysml

@@ -10,19 +10,16 @@ package memo_examples_gpca_pump_viewpoints_cybersecurity_views_document_threat_m
         expose memo_examples_gpca_pump_viewpoints_cybersecurity_views_document_threat_model_view::*;
         attribute :>> id = "DOC-002";
         attribute :>> name = "GPCACyberThreatModelView";
-        attribute :>> title = "GPCA Cybersecurity Threat Model View";
         attribute :>> shortDescription = "Threat-model-oriented document view for GPCA.";
         attribute :>> description = "Captures GPCA cyber assets, trust boundaries, threats, threat scenarios, vulnerabilities, and mitigations for secure product development records.";
         attribute :>> version = "0.1";
         attribute :>> lifecycleState = LifecycleStateKind::development;
         attribute :>> marketScope = "generic";
-        attribute :>> documentUsage = ("Threat Model", "QMSR");
-        attribute :>> sectionIdentifier = "CYB-TM";
-        part :>> viewpointDefinition = cybersecurityViewpoint;
+        ref :>> viewpointDefinition = cybersecurityViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-008";
             attribute :>> name = "threatModelViewQuery";
-            attribute :>> includeElementKinds = ("Threat", "ThreatScenario", "Vulnerability", "CybersecurityAsset", "TrustBoundary", "AttackSurface", "CyberMitigation", "SecurityRequirement");
+            attribute :>> includeElementKinds = ("Threat", "OperativeScenario[scenarioKind=threat]", "Vulnerability", "CybersecurityAsset", "TrustBoundary", "AttackSurface", "CyberMitigation", "SecurityRequirement");
             attribute :>> includeRelationshipKinds = ("ThreatenedBy", "Exploits", "RealizedByScenario", "CrossesTrustBoundary", "Mitigates", "DerivesCyberRequirement");
             attribute :>> rationaleText = "Declares what this document-backed view renders; the web renderer is presentation-only.";
         }

package/examples/gpca-pump/model/catalog/viewpoints/functional/views/functional_function_allocation_view.sysml

@@ -18,7 +18,6 @@ package memo_examples_gpca_pump_viewpoints_functional_views_functional_function_
         attribute depth = 2;
         attribute :>> id = "VIEW-FUN-102";
         attribute :>> name = "GPCA_FunctionAllocationView";
-        attribute :>> title = "GPCA Function Allocation View";
         attribute :>> shortDescription = "Allocation of logical functions to software components and hardware assemblies.";
         attribute :>> outputKind = (ViewOutputKind::matrix);
         attribute :>> presentationKind = (PresentationKind::traceMatrix);
@@ -27,7 +26,6 @@ package memo_examples_gpca_pump_viewpoints_functional_views_functional_function_
         attribute :>> dataSourceDescription = "AllocatedTo links between functions and architecture elements";
         attribute :>> autoPopulate = true;
         attribute :>> queryDescription = "Include logical functions with their AllocatedTo targets.";
-        attribute :>> documentUsage = ("SDD", "Architecture Description");
         part :>> selectionQuery {
             attribute :>> id = "QRY-FUN-102";
             attribute :>> name = "GPCA_FunctionAllocationQuery";
@@ -37,6 +35,6 @@ package memo_examples_gpca_pump_viewpoints_functional_views_functional_function_
             attribute :>> selectionExpression = "product == 'GPCA'";
             attribute :>> rationaleText = "Show complete function-to-component allocation coverage.";
         }
-        part :>> viewpointDefinition = functionalViewpoint;
+        ref :>> viewpointDefinition = functionalViewpoint;
     }
 }

package/examples/gpca-pump/model/catalog/viewpoints/functional/views/functional_function_browser_view.sysml

@@ -18,7 +18,6 @@ package memo_examples_gpca_pump_viewpoints_functional_views_functional_function_
         attribute depth = 2;
         attribute :>> id = "VIEW-FUN-103";
         attribute :>> name = "GPCA_FunctionBrowserView";
-        attribute :>> title = "GPCA Function Browser";
         attribute :>> shortDescription = "Membership tree over the functions layer: logical functions, flows, and the exchange item definitions, grouped by kind.";
         attribute :>> description = "Browser view (SysML v2 browser view kind) exposing the functions-layer membership hierarchy as a first-class view: the eleven logical functions, the logical flows connecting them, and the data/control definitions they exchange — with kind icons, expand/collapse, and filtering.";
         attribute :>> outputKind = (ViewOutputKind::diagram);
@@ -27,7 +26,6 @@ package memo_examples_gpca_pump_viewpoints_functional_views_functional_function_
         attribute :>> dataSourceDescription = "GPCA logical functions, flows, and exchange item definitions";
         attribute :>> autoPopulate = true;
         attribute :>> queryDescription = "Include the functions layer's functions, flows, and exchange item definitions.";
-        attribute :>> documentUsage = ("SDD");
         part :>> selectionQuery {
             attribute :>> id = "QRY-FUN-103";
             attribute :>> name = "GPCA_FunctionBrowserQuery";
@@ -36,6 +34,6 @@ package memo_examples_gpca_pump_viewpoints_functional_views_functional_function_
             attribute :>> selectionExpression = "product == 'GPCA'";
             attribute :>> rationaleText = "Auto-populate the function browser from the functions layer.";
         }
-        part :>> viewpointDefinition = functionalViewpoint;
+        ref :>> viewpointDefinition = functionalViewpoint;
     }
 }

package/examples/gpca-pump/model/catalog/viewpoints/logical/views/behavior_action_flow_view.sysml

@@ -18,7 +18,6 @@ package memo_examples_gpca_pump_viewpoints_logical_views_behavior_action_flow_vi
         attribute depth = 2;
         attribute :>> id = "VIEW-BHV-003";
         attribute :>> name = "GPCA_InfusionDeliveryActionFlowView";
-        attribute :>> title = "GPCA Infusion Delivery Action Flow";
         attribute :>> shortDescription = "The 20 ms execution-step pipeline from sensor acquisition through alarm evaluation and dose limiting to pump actuation and event logging.";
         attribute :>> description = "Action flow over the infusionDeliveryFlow composite action: typed action steps with in/out parameters, item flows carrying the DD/CD exchange items, succession ordering from start to done, and swimlane allocation onto the logical architecture (sensors, alarm, infusion manager, pump motor, logging).";
         attribute :>> outputKind = (ViewOutputKind::diagram);
@@ -28,7 +27,6 @@ package memo_examples_gpca_pump_viewpoints_logical_views_behavior_action_flow_vi
         attribute :>> dataSourceDescription = "GPCA infusion delivery composite action, item flows, and successions";
         attribute :>> autoPopulate = true;
         attribute :>> queryDescription = "Include the nested action usages of the infusion delivery flow with their flows and successions.";
-        attribute :>> documentUsage = ("SDD");
         part :>> selectionQuery {
             attribute :>> id = "QRY-BHV-103";
             attribute :>> name = "GPCA_ActionFlowQuery";
@@ -36,6 +34,6 @@ package memo_examples_gpca_pump_viewpoints_logical_views_behavior_action_flow_vi
             attribute :>> selectionExpression = "product == 'GPCA'";
             attribute :>> rationaleText = "Auto-populate the action flow view from the behavior layer's action usages.";
         }
-        part :>> viewpointDefinition = logicalArchitectureViewpoint;
+        ref :>> viewpointDefinition = logicalArchitectureViewpoint;
     }
 }

package/examples/gpca-pump/model/catalog/viewpoints/logical/views/document_architecture_description_view.sysml

@@ -11,7 +11,6 @@ package memo_examples_gpca_pump_viewpoints_logical_views_document_architecture_d
         expose memo_examples_gpca_pump_viewpoints_logical_views_document_architecture_description_view::*;
         attribute :>> id = "DOC-005";
         attribute :>> name = "ArchitectureDescriptionView";
-        attribute :>> title = "GPCA System Architecture Description View";
         attribute :>> shortDescription = "ISO/IEC/IEEE 42010 architecture description across all layers.";
         attribute :>> description = "Aggregates context, operational, functional, logical, software, and physical layers with their views and correspondences for the system architecture description.";
         attribute :>> version = "0.1";
@@ -19,16 +18,14 @@ package memo_examples_gpca_pump_viewpoints_logical_views_document_architecture_d
         attribute :>> viewKind = DocumentViewKind::architectureDescription;
         attribute :>> generationRule = "Include all architecture layers, functional chains, interfaces, and the physical BOM with cross-layer allocations";
         attribute :>> marketScope = "generic";
-        attribute :>> documentUsage = ("Architecture Description", "DHF");
-        attribute :>> sectionIdentifier = "AD";
-        part vpLogicalArchitecture :> viewpointDefinition = logicalArchitectureViewpoint;
-        part vpSoftware :> viewpointDefinition = softwareViewpoint;
-        part vpPhysical :> viewpointDefinition = physicalViewpoint;
+        ref vpLogicalArchitecture :> viewpointDefinition = logicalArchitectureViewpoint;
+        ref vpSoftware :> viewpointDefinition = softwareViewpoint;
+        ref vpPhysical :> viewpointDefinition = physicalViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-005";
             attribute :>> name = "architectureDescriptionViewQuery";
             attribute :>> includeElementKinds = ("LogicalComponent", "SystemFunction", "ComponentExchange", "SoftwareSystem", "SoftwareModule", "HardwareAssembly", "ProcessingNode", "PhysicalPort", "FunctionalFlow", "FunctionalFlowStep");
-            attribute :>> includeRelationshipKinds = ("Composes", "AllocatedTo", "Realizes", "BindsToInterface", "InvolvesFunction", "Precedes", "DeploysTo", "HostedBy");
+            attribute :>> includeRelationshipKinds = ("Composes", "AllocatedTo", "Realizes", "BindsToInterface", "Performs", "Succession", "DeploysTo", "HostedBy");
             attribute :>> rationaleText = "Declares what this document-backed view renders; the web renderer is presentation-only.";
         }
     }

package/examples/gpca-pump/model/catalog/viewpoints/logical/views/logical_device_interconnect_view.sysml

@@ -18,26 +18,24 @@ package memo_examples_gpca_pump_viewpoints_logical_views_logical_device_intercon
         attribute depth = 2;
         attribute :>> id = "VIEW-LOG-003";
         attribute :>> name = "GPCA_DeviceInterconnectView";
-        attribute :>> title = "GPCA Device Interconnect View";
         attribute :>> shortDescription = "AADL device-level interconnection: GPCA_HW_Sensors, GPCA_SW, and GPCA_HW_Actuators with their declared boundary features.";
         attribute :>> description = "Source-faithful interconnection view of GPCA_Device.Impl: exactly the three AADL subcomponents (GPCA_HW_Sensors, GPCA_SW, GPCA_HW_Actuators), the device and subsystem boundary ports, and the twelve declared port connections. MEMO physical-design additions such as the controller board, power sources, enclosure, and individual sensors/actuators are intentionally excluded because the published AADL v2.0 model does not declare them as GPCA_Device.Impl subcomponents. Drill into GPCA_SW to inspect its eight subcomponents and 42 internal connections; use the connection-density control to switch between bundled summary and full fidelity.";
         attribute :>> outputKind = (ViewOutputKind::diagram);
         attribute :>> presentationKind = (PresentationKind::internalDiagram);
         attribute :>> viewKind = DiagramViewKind::interconnection;
         attribute :>> diagramType = "ibd";
-        attribute :>> dataSourceDescription = "GPCA hardware assemblies, software system, software components, boundary ports, and the ExchangesWith/Composes topology";
+        attribute :>> dataSourceDescription = "GPCA hardware assemblies, software system, software components, boundary ports, and the flow/bind/Composes topology";
         attribute :>> autoPopulate = true;
         attribute :>> queryDescription = "Include hardware assemblies, the software system with its components and boundary ports, and the exchange topology between them.";
-        attribute :>> documentUsage = ("SDD", "Architecture Description", "QMSR");
         part :>> selectionQuery {
             attribute :>> id = "QRY-LOG-003";
             attribute :>> name = "GPCA_DeviceInterconnectQuery";
             attribute :>> includeElementIds = ("gpcaDevice", "gpcaDeviceSensors", "gpcaSoftware", "gpcaActuators", "devOpCmdIn", "devDbIn", "devPresIn", "devPatientIn", "devGpcaOut", "snsOpCmdIn", "snsDbIn", "snsPresIn", "snsPatientIn", "snsOpCmdOut", "snsPresOut", "snsPatientOut", "snsSensorOut", "snsConstOut", "snsDbOut", "portOpCmdIn", "portPresIn", "portPatientIn", "portSensorIn", "portConstIn", "portDbIn", "portGpcaSwOut", "actGpcaSwIn", "actGpcaOut", "tlm", "systemStatus", "alarm", "config", "infusionMgr", "systemMonitor", "logging", "outputBus");
-            attribute :>> includeRelationshipKinds = ("ExchangesWith", "Composes");
+            attribute :>> includeRelationshipKinds = ("flow", "bind", "Composes");
             attribute :>> includeLayers = ("logical_structure", "software_structure", "interfaces");
             attribute :>> selectionExpression = "product == 'GPCA'";
             attribute :>> rationaleText = "Render the device interconnect: parts with boundary ports as nodes, AADL connections as typed connectors, composition as nesting.";
         }
-        part :>> viewpointDefinition = logicalArchitectureViewpoint;
+        ref :>> viewpointDefinition = logicalArchitectureViewpoint;
     }
 }