Merge pull request #846 from mimiframework/ConnectorCompDims

Connector comp dims

Author: davidanthoff

src/components/connector.jl

@@ -21,11 +21,11 @@ using Mimi
 end
 
 @defcomp ConnectorCompMatrix begin
-    regions = Index()
+    ConnectorCompMatrix_Dim2 = Index()
 
-    input1 = Parameter(index = [time, regions])
-    input2 = Parameter(index = [time, regions])
-    output =  Variable(index = [time, regions])
+    input1 = Parameter(index = [time, ConnectorCompMatrix_Dim2])
+    input2 = Parameter(index = [time, ConnectorCompMatrix_Dim2])
+    output =  Variable(index = [time, ConnectorCompMatrix_Dim2])
 
     first = Parameter() # first year to use the shorter data
     last = Parameter()  # last year to use the shorter data
@@ -38,7 +38,7 @@ end
             input = p.input2
         end 
 
-        for r in d.regions
+        for r in d.ConnectorCompMatrix_Dim2
             v.output[t, r] = @allow_missing(input[t, r])
         end
     end

src/core/connections.jl

@@ -1082,6 +1082,9 @@ function add_connector_comps!(obj::AbstractCompositeComponentDef)
             # required it, and for now let the first and last of the component 
             # be free and thus be set to the same as the model
             conn_comp = add_comp!(obj, conn_comp_def, conn_comp_name, before=comp_name)
+            if num_dims == 2
+                set_dimension!(obj, :ConnectorCompMatrix_Dim2, 1:size(model_param(obj, conn.backup).values,2))
+            end
             conn_path = conn_comp.comp_path
 
             # remove the connections added in add_comp!