add simulation_settings to generic_tech, cleanup

gdsfactory/export/to_stl.py

@@ -5,7 +5,7 @@
 
 import gdsfactory.generic_tech as generic
 from gdsfactory.component import Component
-from gdsfactory.technology.layer_stack import LayerStack, LayerViews
+from gdsfactory.technology import LayerStack, LayerViews
 from gdsfactory.types import Layer
 
 

gdsfactory/generic_tech/__init__.py

@@ -1,9 +1,9 @@
 from gdsfactory.config import layer_path
-from gdsfactory.generic_tech.layer_map import GenericLayerMap
+from gdsfactory.generic_tech.layer_map import GenericLayerMap as LayerMap
 from gdsfactory.generic_tech.layer_stack import get_layer_stack_generic
 from gdsfactory.technology import LayerViews
 
-LAYER = GenericLayerMap()
+LAYER = LayerMap()
 LAYER_VIEWS = LayerViews(filepath=layer_path)
 LAYER_STACK = get_layer_stack_generic()
 

gdsfactory/generic_tech/layer_stack.py

@@ -1,5 +1,5 @@
 from gdsfactory.generic_tech.layer_map import LAYER
-from gdsfactory.technology.layer_stack import LayerLevel, LayerStack
+from gdsfactory.technology import LayerLevel, LayerStack
 
 nm = 1e-3
 

gdsfactory/generic_tech/simulation_settings.py

@@ -0,0 +1,3 @@
+from gdsfactory.technology.simulation_settings import SimulationSettingsLumericalFdtd
+
+SIMULATION_SETTINGS_LUMERICAL_FDTD = SimulationSettingsLumericalFdtd()

gdsfactory/pdk.py

@@ -21,8 +21,7 @@
 from gdsfactory.read.from_yaml import from_yaml
 from gdsfactory.show import show
 from gdsfactory.symbols import floorplan_with_block_letters
-from gdsfactory.technology.layer_stack import LayerStack
-from gdsfactory.technology.layer_views import LayerViews
+from gdsfactory.technology import LayerStack, LayerViews
 from gdsfactory.types import (
     CellSpec,
     Component,

gdsfactory/read/from_yaml.py

@@ -635,7 +635,10 @@ def _from_yaml(
         label_instance_function: to label each instance.
 
     """
-    from gdsfactory.pdk import GENERIC, get_active_pdk
+    from gdsfactory.generic_tech import get_generic_pdk
+    from gdsfactory.pdk import get_active_pdk
+
+    GENERIC = get_generic_pdk()
 
     c = Component()
     instances = {}

gdsfactory/samples/pdk/fab_c.py

@@ -12,7 +12,7 @@
 from gdsfactory.component import Component
 from gdsfactory.cross_section import strip
 from gdsfactory.port import select_ports
-from gdsfactory.technology.layer_stack import LayerLevel, LayerStack
+from gdsfactory.technology import LayerLevel, LayerStack
 from gdsfactory.types import Layer
 
 

gdsfactory/simulation/add_simulation_markers.py

@@ -10,7 +10,8 @@
 from gdsfactory.component import Component
 from gdsfactory.components.bend_circular import bend_circular
 from gdsfactory.pdk import get_layer_stack
-from gdsfactory.types import ComponentSpec, Layer, LayerLevel, LayerSpec
+from gdsfactory.technology import LayerLevel
+from gdsfactory.types import ComponentSpec, Layer, LayerSpec
 
 
 @gf.cell

gdsfactory/simulation/devsim/doping.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel
 
 import gdsfactory as gf
-from gdsfactory.technology import Layer
+from gdsfactory.types import Layer
 
 
 class DopingLayerLevel(BaseModel):
@@ -40,7 +40,7 @@ def get_doping_info_generic(
     ppp_conc: float = 1e18,  # * cm3_to_um3,
 ):
 
-    layermap = gf.tech.LayerMap()
+    layermap = gf.generic_tech.LayerMap()
 
     return {
         "N": DopingLayerLevel(

gdsfactory/simulation/devsim/get_simulation.py

@@ -237,7 +237,7 @@ def create_2Duz_simulation(
 if __name__ == "__main__":
 
     import gdsfactory as gf
-    from gdsfactory.technology import get_layer_stack_generic
+    from gdsfactory.generic_tech import get_layer_stack_generic
 
     # We choose a representative subdomain of the component
     waveguide = gf.Component()
@@ -251,7 +251,7 @@ def create_2Duz_simulation(
     waveguide.show()
 
     # We will restrict the physical mesh to a subset of layers:
-    layermap = gf.tech.LayerMap()
+    layermap = gf.generic_tech.LayerMap()
     physical_layerstack = LayerStack(
         layers={
             k: get_layer_stack_generic().layers[k]

gdsfactory/simulation/devsim/get_solver.py

@@ -192,7 +192,7 @@ def delete_device(self) -> None:
 if __name__ == "__main__":
 
     import gdsfactory as gf
-    from gdsfactory.technology import get_layer_stack_generic
+    from gdsfactory.generic_tech import get_layer_stack_generic
 
     # We choose a representative subdomain of the component
     waveguide = gf.Component()
@@ -204,7 +204,7 @@ def delete_device(self) -> None:
     )
 
     # We will restrict the physical mesh to a subset of layers:
-    layermap = gf.tech.LayerMap()
+    layermap = gf.generic_tech.LayerMap()
     physical_layerstack = LayerStack(
         layers={
             k: get_layer_stack_generic().layers[k]

gdsfactory/simulation/eme/meow_eme.py

@@ -11,12 +11,13 @@
 
 import gdsfactory as gf
 from gdsfactory.config import logger
-from gdsfactory.generic_tech import LAYER, LayerStack
+from gdsfactory.generic_tech import LAYER
 from gdsfactory.pdk import _ACTIVE_PDK
 from gdsfactory.simulation.get_sparameters_path import (
     get_sparameters_path_meow as get_sparameters_path,
 )
 from gdsfactory.simulation.gmsh.parse_layerstack import list_unique_layerstack_z
+from gdsfactory.technology import LayerStack
 from gdsfactory.types import PathType
 
 ColorRGB = Tuple[float, float, float]
@@ -380,7 +381,7 @@ def compute_sparameters(self) -> Dict[str, np.ndarray]:
     c = gf.components.taper(length=10, width2=2)
     c.show()
 
-    from gdsfactory.technology import get_layer_stack_generic
+    from gdsfactory.generic_tech import get_layer_stack_generic
 
     filtered_layerstack = LayerStack(
         layers={

gdsfactory/simulation/eme/test_meow_simulation.py

@@ -1,8 +1,9 @@
 import numpy as np
 
 import gdsfactory as gf
+from gdsfactory.generic_tech import get_layer_stack_generic
 from gdsfactory.simulation.eme import MEOW
-from gdsfactory.technology import LayerStack, get_layer_stack_generic
+from gdsfactory.technology import LayerStack
 
 
 def test_meow_defaults():

gdsfactory/simulation/fem/mode_solver.py

@@ -3,8 +3,9 @@
 from skfem import Basis, ElementTriN2, ElementTriP0, ElementTriP2, Mesh
 
 import gdsfactory as gf
+from gdsfactory.generic_tech import get_layer_stack_generic
 from gdsfactory.pdk import _ACTIVE_PDK
-from gdsfactory.technology import LayerStack, get_layer_stack_generic
+from gdsfactory.technology import LayerStack
 from gdsfactory.types import CrossSectionSpec
 
 

gdsfactory/simulation/fem/test_mode_solver.py

@@ -1,7 +1,8 @@
 import numpy as np
 
+from gdsfactory.generic_tech import get_layer_stack_generic
 from gdsfactory.simulation.fem.mode_solver import compute_cross_section_modes
-from gdsfactory.technology import LayerStack, get_layer_stack_generic
+from gdsfactory.technology import LayerStack
 
 
 def test_compute_cross_section_mode():

gdsfactory/simulation/get_sparameters_path.py

@@ -10,9 +10,9 @@
 import numpy as np
 
 import gdsfactory as gf
+from gdsfactory.generic_tech import LAYER_STACK
 from gdsfactory.name import clean_value
 from gdsfactory.pdk import get_sparameters_path
-from gdsfactory.technology import LAYER_STACK
 from gdsfactory.types import ComponentSpec
 
 

gdsfactory/simulation/gmeep/get_meep_geometry.py

@@ -8,7 +8,8 @@
 import gdsfactory as gf
 from gdsfactory.pdk import get_layer_stack
 from gdsfactory.simulation.gmeep.get_material import get_material
-from gdsfactory.types import ComponentSpec, CrossSectionSpec, LayerStack
+from gdsfactory.technology import LayerStack
+from gdsfactory.types import ComponentSpec, CrossSectionSpec
 
 
 def get_meep_geometry_from_component(

gdsfactory/simulation/gmeep/test_write_sparameters_meep.py

@@ -7,7 +7,7 @@
 import gdsfactory as gf
 import gdsfactory.simulation as sim
 import gdsfactory.simulation.gmeep as gm
-from gdsfactory.technology import LAYER_STACK
+from gdsfactory.generic_tech import LAYER_STACK
 
 simulation_settings = dict(resolution=20, is_3d=False)
 

gdsfactory/simulation/gmsh/tests/test_meshing.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
 import gdsfactory as gf
+from gdsfactory.generic_tech import get_layer_stack_generic
 from gdsfactory.simulation.gmsh.uz_xsection_mesh import uz_xsection_mesh
 from gdsfactory.simulation.gmsh.xy_xsection_mesh import xy_xsection_mesh
-from gdsfactory.technology import LayerStack, get_layer_stack_generic
+from gdsfactory.technology import LayerStack
 
 
 def test_gmsh_uz_xsection_mesh():
@@ -43,7 +44,7 @@ def test_gmsh_xy_xsection_mesh():
     waveguide = gf.components.straight_pin(length=10, taper=None)
     waveguide.show()
 
-    from gdsfactory.technology import get_layer_stack_generic
+    from gdsfactory.generic_tech import get_layer_stack_generic
 
     filtered_layerstack = LayerStack(
         layers={

gdsfactory/simulation/lumerical/read.py

@@ -9,10 +9,11 @@
 import gdsfactory as gf
 from gdsfactory.component import Component
 from gdsfactory.config import logger
+from gdsfactory.generic_tech import LAYER_STACK
 from gdsfactory.simulation.get_sparameters_path import (
     get_sparameters_path_lumerical as get_sparameters_path,
 )
-from gdsfactory.technology import LAYER_STACK, LayerStack
+from gdsfactory.technology import LayerStack
 
 
 def get_ports(line: str) -> Tuple[str, str]:

gdsfactory/simulation/lumerical/write_sparameters_lumerical.py

@@ -10,16 +10,13 @@
 
 import gdsfactory as gf
 from gdsfactory.config import __version__, logger
+from gdsfactory.generic_tech import SIMULATION_SETTINGS_LUMERICAL_FDTD
+from gdsfactory.materials import MaterialSpec
 from gdsfactory.pdk import get_layer_stack
 from gdsfactory.simulation.get_sparameters_path import (
     get_sparameters_path_lumerical as get_sparameters_path,
 )
-from gdsfactory.technology import (
-    SIMULATION_SETTINGS_LUMERICAL_FDTD,
-    LayerStack,
-    MaterialSpec,
-    SimulationSettingsLumericalFdtd,
-)
+from gdsfactory.technology import LayerStack, SimulationSettingsLumericalFdtd
 from gdsfactory.types import ComponentSpec, PathType
 
 run_false_warning = """

gdsfactory/simulation/modes/get_mode_solver_cross_section.py

@@ -13,7 +13,8 @@
 from gdsfactory.simulation.gmeep.get_meep_geometry import (
     get_meep_geometry_from_cross_section,
 )
-from gdsfactory.types import CrossSectionSpec, LayerStack
+from gdsfactory.technology import LayerStack
+from gdsfactory.types import CrossSectionSpec
 
 mpb.Verbosity(0)
 

gdsfactory/simulation/thermal/heater.py

@@ -217,9 +217,9 @@ def update(event):
     import gdsfactory as gf
     from gdsfactory.simulation.gmsh.mesh2D import mesh2D
 
-    gf.tech.LAYER_STACK.layers["heater"].thickness = 0.13
-    gf.tech.LAYER_STACK.layers["heater"].zmin = 2.2
-    print(gf.tech.LAYER_STACK.layers.keys())
+    gf.generic_tech.LAYER_STACK.layers["heater"].thickness = 0.13
+    gf.generic_tech.LAYER_STACK.layers["heater"].zmin = 2.2
+    print(gf.generic_tech.LAYER_STACK.layers.keys())
     # gf.tech.LAYER_STACK.layers["core"].thickness = 2
 
     heater1 = gf.components.straight_heater_metal(length=50, heater_width=2)

gdsfactory/technology/__init__.py

@@ -1,11 +1,13 @@
 from gdsfactory.technology.layer_map import lyp_to_dataclass
 from gdsfactory.technology.layer_stack import LayerLevel, LayerStack
 from gdsfactory.technology.layer_views import LayerView, LayerViews
+from gdsfactory.technology.simulation_settings import SimulationSettingsLumericalFdtd
 
 __all__ = [
     "LayerView",
     "LayerViews",
     "LayerLevel",
     "LayerStack",
     "lyp_to_dataclass",
+    "SimulationSettingsLumericalFdtd",
 ]

gdsfactory/technology/klayout_tech.py

@@ -10,7 +10,7 @@
 from pydantic import BaseModel, Field
 
 from gdsfactory.config import PATH
-from gdsfactory.technology.layer_views import LayerViews
+from gdsfactory.technology import LayerViews
 
 Layer = Tuple[int, int]
 ConductorViaConductorName = Tuple[str, str, str]