added GMCM support

Author: chrisbc

nshm/admin.py

@@ -4,15 +4,19 @@
     SeismicHazardModel,
     SourceLogicTree, 
     SourceLogicTreeComponent,
-    SourceLogicTreeWeightedComponent
+    SourceLogicTreeWeightedComponent,
+    GMCMLogicTree
 )
 
 class SeismicHazardModelAdmin(admin.ModelAdmin):
-    fields = ["version", "notes", "source_logic_tree" ]
+    fields = ["version", "notes", "source_logic_tree", "gmcm_logic_tree" ]
 
 class SourceLogicTreeAdmin(admin.ModelAdmin):
     fields = ["version", "notes"]
 
+class GMCMLogicTreeAdmin(admin.ModelAdmin):
+    fields = ["version", "notes"]
+
 class SourceLogicTreeComponentAdmin(admin.ModelAdmin):
     fields = ["tag", "notes", "inversion_toshi_id", "background_toshi_id", "tectonic_region", "group" ]
 
@@ -21,5 +25,6 @@ class SourceLogicTreeWeightedComponentAdmin(admin.ModelAdmin):
 
 admin.site.register(SeismicHazardModel, SeismicHazardModelAdmin)
 admin.site.register(SourceLogicTree, SourceLogicTreeAdmin)
+admin.site.register(GMCMLogicTree, GMCMLogicTreeAdmin)
 admin.site.register(SourceLogicTreeComponent, SourceLogicTreeComponentAdmin)
 admin.site.register(SourceLogicTreeWeightedComponent, SourceLogicTreeWeightedComponentAdmin)

nshm/migrations/0009_gmcm_logictree_seismichazardmodel_gmcm_logic_tree.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.4 on 2023-08-25 03:43
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nshm', '0008_alter_seismichazardmodel_notes_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GMCM_LogicTree',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('version', models.CharField(max_length=30)),
+                ('notes', models.TextField(blank=True, null=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='seismichazardmodel',
+            name='gmcm_logic_tree',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='seismic_hazard_models', to='nshm.gmcm_logictree'),
+        ),
+    ]

nshm/migrations/0010_rename_gmcm_logictree_gmcmlogictree.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.4 on 2023-08-25 03:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nshm', '0009_gmcm_logictree_seismichazardmodel_gmcm_logic_tree'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='GMCM_LogicTree',
+            new_name='GMCMLogicTree',
+        ),
+    ]

nshm/models.py

@@ -13,15 +13,6 @@ class SourceLogicTree(models.Model):
     def __str__(self):
         return self.version
 
-class SeismicHazardModel(models.Model):
-    version = models.CharField(max_length=30)
-    notes = models.TextField(null=True, blank=True)
-    source_logic_tree = models.ForeignKey(
-        SourceLogicTree, related_name='seismic_hazard_models',null=True, blank=True, on_delete=models.SET_NULL)
-    
-    def __str__(self):
-        return self.version
-
 
 class SourceLogicTreeComponent(models.Model):
     tag = models.CharField(max_length=50)
@@ -34,11 +25,33 @@ class SourceLogicTreeComponent(models.Model):
     def __str__(self):
         return f"{self.tag} {self.tectonic_region}"
 
+
 class SourceLogicTreeWeightedComponent(models.Model):
     weight = models.FloatField()
     source_logic_tree = models.ForeignKey(
         SourceLogicTree, related_name='slt_weighted_components', null=False, on_delete=models.CASCADE)
     source_logic_tree_component = models.ForeignKey(SourceLogicTreeComponent, related_name='slt_weighted_components', null=True, on_delete=models.SET_NULL)
 
     def __str__(self):
-        return f"{self.source_logic_tree_component.tag} {self.weight}"
+        return f"{self.source_logic_tree_component.tag} {self.weight}"
+    
+
+class GMCMLogicTree(models.Model):
+    version = models.CharField(max_length=30)
+    notes = models.TextField(null=True, blank=True)
+
+    def __str__(self):
+        return self.version
+    
+class SeismicHazardModel(models.Model):
+    version = models.CharField(max_length=30)
+    notes = models.TextField(null=True, blank=True)
+    source_logic_tree = models.ForeignKey(
+        SourceLogicTree, related_name='seismic_hazard_models',null=True, blank=True, on_delete=models.SET_NULL)
+    
+    gmcm_logic_tree = models.ForeignKey(
+        GMCMLogicTree, related_name='seismic_hazard_models',null=True, blank=True, on_delete=models.SET_NULL)
+    
+    def __str__(self):
+        return self.version
+

nshm/schema.py

@@ -37,6 +37,16 @@ class Meta:
         model = models.SourceLogicTreeWeightedComponent
         interfaces = (relay.Node, )
 
+class GMCM_LogicTree(DjangoObjectType):
+    """Ground Motion Characteristic Model (GMCM) Logic Tree
+    
+    A list of GMMs by tectonic region, with weights. Tectonic region weights must sum to 1.
+    """
+    class Meta:
+        model = models.GMCMLogicTree
+        filter_fields = ['version', 'notes']
+        interfaces = (relay.Node, )
+    
 class Query(ObjectType):
     seismic_hazard_model = relay.Node.Field(SeismicHazardModel)
     all_seismic_hazard_models = DjangoFilterConnectionField(SeismicHazardModel)
@@ -47,4 +57,7 @@ class Query(ObjectType):
     source_logic_tree_component = relay.Node.Field(SourceLogicTreeComponent)
     all_source_logic_tree_components = DjangoFilterConnectionField(SourceLogicTreeComponent)
 
+    gmcm_logic_tree = relay.Node.Field(GMCM_LogicTree)
+    all_gmcm_logic_trees = DjangoFilterConnectionField(GMCM_LogicTree)
+
     # source_logic_tree_weighted_component = relay.Node.Field(SourceLogicTreeWeightedComponent)