refactor path integral names

Author: dmarek-flex

docs/api/microwave/ports/wave.rst

@@ -48,10 +48,10 @@ If it is desired to only solve for the 2D port mode, one can use the ``to_mode_s
 
    tidy3d.plugins.microwave.VoltageIntegralAxisAligned
    tidy3d.plugins.microwave.CurrentIntegralAxisAligned
-   tidy3d.plugins.microwave.CustomVoltageIntegral2D
-   tidy3d.plugins.microwave.CustomCurrentIntegral2D
+   tidy3d.plugins.microwave.Custom2DVoltageIntegral
+   tidy3d.plugins.microwave.Custom2DCurrentIntegral
    tidy3d.plugins.microwave.AxisAlignedPathIntegral
-   tidy3d.plugins.microwave.CustomPathIntegral2D
+   tidy3d.plugins.microwave.Custom2DPathIntegral
    tidy3d.plugins.microwave.ImpedanceCalculator
 
 The classes above are used to define the voltage/current integration paths for impedance calculation.

docs/api/plugins/microwave.rst

@@ -15,9 +15,9 @@ Microwave
    tidy3d.plugins.microwave.AxisAlignedPathIntegral 
    tidy3d.plugins.microwave.VoltageIntegralAxisAligned
    tidy3d.plugins.microwave.CurrentIntegralAxisAligned
-   tidy3d.plugins.microwave.CustomPathIntegral2D 
-   tidy3d.plugins.microwave.CustomVoltageIntegral2D
-   tidy3d.plugins.microwave.CustomCurrentIntegral2D
+   tidy3d.plugins.microwave.Custom2DPathIntegral 
+   tidy3d.plugins.microwave.Custom2DVoltageIntegral
+   tidy3d.plugins.microwave.Custom2DCurrentIntegral
    tidy3d.plugins.microwave.ImpedanceCalculator
    tidy3d.plugins.microwave.RectangularAntennaArrayCalculator
    tidy3d.plugins.microwave.LobeMeasurer

schemas/EMESimulation.json

@@ -1776,7 +1776,7 @@
                 "$ref": "#/definitions/CurrentIntegralAxisAlignedSpec"
               },
               {
-                "$ref": "#/definitions/CustomCurrentIntegral2DSpec"
+                "$ref": "#/definitions/Custom2DCurrentIntegralSpec"
               }
             ]
           },
@@ -2228,6 +2228,78 @@
       ],
       "type": "object"
     },
+    "Custom2DCurrentIntegralSpec": {
+      "additionalProperties": false,
+      "properties": {
+        "attrs": {
+          "default": {},
+          "type": "object"
+        },
+        "axis": {
+          "default": 2,
+          "enum": [
+            0,
+            1,
+            2
+          ],
+          "type": "integer"
+        },
+        "position": {
+          "type": "number"
+        },
+        "type": {
+          "default": "Custom2DCurrentIntegralSpec",
+          "enum": [
+            "Custom2DCurrentIntegralSpec"
+          ],
+          "type": "string"
+        },
+        "vertices": {
+          "type": "ArrayLike"
+        }
+      },
+      "required": [
+        "position",
+        "vertices"
+      ],
+      "type": "object"
+    },
+    "Custom2DVoltageIntegralSpec": {
+      "additionalProperties": false,
+      "properties": {
+        "attrs": {
+          "default": {},
+          "type": "object"
+        },
+        "axis": {
+          "default": 2,
+          "enum": [
+            0,
+            1,
+            2
+          ],
+          "type": "integer"
+        },
+        "position": {
+          "type": "number"
+        },
+        "type": {
+          "default": "Custom2DVoltageIntegralSpec",
+          "enum": [
+            "Custom2DVoltageIntegralSpec"
+          ],
+          "type": "string"
+        },
+        "vertices": {
+          "type": "ArrayLike"
+        }
+      },
+      "required": [
+        "position",
+        "vertices"
+      ],
+      "type": "object"
+    },
     "CustomAnisotropicMedium": {
       "additionalProperties": false,
       "properties": {
@@ -2496,42 +2568,6 @@
       ],
       "type": "object"
     },
-    "CustomCurrentIntegral2DSpec": {
-      "additionalProperties": false,
-      "properties": {
-        "attrs": {
-          "default": {},
-          "type": "object"
-        },
-        "axis": {
-          "default": 2,
-          "enum": [
-            0,
-            1,
-            2
-          ],
-          "type": "integer"
-        },
-        "position": {
-          "type": "number"
-        },
-        "type": {
-          "default": "CustomCurrentIntegral2DSpec",
-          "enum": [
-            "CustomCurrentIntegral2DSpec"
-          ],
-          "type": "string"
-        },
-        "vertices": {
-          "type": "ArrayLike"
-        }
-      },
-      "required": [
-        "position",
-        "vertices"
-      ],
-      "type": "object"
-    },
     "CustomDebye": {
       "additionalProperties": false,
       "properties": {
@@ -3161,7 +3197,7 @@
               "$ref": "#/definitions/CurrentIntegralAxisAlignedSpec"
             },
             {
-              "$ref": "#/definitions/CustomCurrentIntegral2DSpec"
+              "$ref": "#/definitions/Custom2DCurrentIntegralSpec"
             }
           ]
         },
@@ -3175,7 +3211,7 @@
         "voltage_spec": {
           "anyOf": [
             {
-              "$ref": "#/definitions/CustomVoltageIntegral2DSpec"
+              "$ref": "#/definitions/Custom2DVoltageIntegralSpec"
             },
             {
               "$ref": "#/definitions/VoltageIntegralAxisAlignedSpec"
@@ -3900,42 +3936,6 @@
       ],
       "type": "object"
     },
-    "CustomVoltageIntegral2DSpec": {
-      "additionalProperties": false,
-      "properties": {
-        "attrs": {
-          "default": {},
-          "type": "object"
-        },
-        "axis": {
-          "default": 2,
-          "enum": [
-            0,
-            1,
-            2
-          ],
-          "type": "integer"
-        },
-        "position": {
-          "type": "number"
-        },
-        "type": {
-          "default": "CustomVoltageIntegral2DSpec",
-          "enum": [
-            "CustomVoltageIntegral2DSpec"
-          ],
-          "type": "string"
-        },
-        "vertices": {
-          "type": "ArrayLike"
-        }
-      },
-      "required": [
-        "position",
-        "vertices"
-      ],
-      "type": "object"
-    },
     "Cylinder": {
       "additionalProperties": false,
       "properties": {