PyOpenMagnetics 1.3.12__tar.gz → 1.3.13__tar.gz

{pyopenmagnetics-1.3.12 → pyopenmagnetics-1.3.13}/.github/workflows/publish.yml

@@ -10,6 +10,11 @@ on:
         required: false
         default: false
         type: boolean
+      publish_to_pypi:
+        description: 'Publish to real PyPI instead of TestPyPI (use to rebuild a failed release without recreating the GitHub release/tag)'
+        required: false
+        default: false
+        type: boolean
 
 env:
   GIT_LFS_SKIP_SMUDGE: 1  # Skip LFS to avoid bandwidth quota issues
@@ -109,18 +114,18 @@ jobs:
               if [ $i -lt 3 ]; then sleep 60; fi
             done
           CIBW_ENVIRONMENT_LINUX: PATH=/opt/rh/gcc-toolset-13/root/usr/bin:$PATH LD_LIBRARY_PATH=/opt/rh/gcc-toolset-13/root/usr/lib64:$LD_LIBRARY_PATH
-          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
+          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core "cmake<4" ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
       - name: Publish Linux wheels to PyPI
-        if: github.event_name == 'release'
+        if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.publish_to_pypi)
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
           packages-dir: wheelhouse/
 
       - name: Publish Linux wheels to TestPyPI
-        if: github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'workflow_dispatch' && !inputs.publish_to_pypi
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/
@@ -181,21 +186,21 @@ jobs:
           CIBW_BUILD: cp310-* cp311-* cp312-* cp313-*
           CIBW_SKIP: "*-win32 *-manylinux_i686 *musllinux* pp*"
           CIBW_BEFORE_ALL_WINDOWS: npm install -g quicktype
-          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
+          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core "cmake<4" ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
       - name: Install twine
         run: python -m pip install twine
 
       - name: Publish Windows wheels to PyPI
-        if: github.event_name == 'release'
+        if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.publish_to_pypi)
         run: python -m twine upload wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Publish Windows wheels to TestPyPI
-        if: github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'workflow_dispatch' && !inputs.publish_to_pypi
         run: python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
@@ -266,21 +271,21 @@ jobs:
               if [ $i -lt 5 ]; then sleep 60; fi
             done
           CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=15.0
-          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
+          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core "cmake<4" ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
       - name: Install twine
         run: python -m pip install twine
 
       - name: Publish macOS wheels to PyPI
-        if: github.event_name == 'release'
+        if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.publish_to_pypi)
         run: python -m twine upload wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Publish macOS wheels to TestPyPI
-        if: github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'workflow_dispatch' && !inputs.publish_to_pypi
         run: python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
@@ -338,14 +343,14 @@ jobs:
         run: python -m build --sdist
 
       - name: Publish sdist to PyPI
-        if: github.event_name == 'release'
+        if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.publish_to_pypi)
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
           packages-dir: dist/
 
       - name: Publish sdist to TestPyPI
-        if: github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'workflow_dispatch' && !inputs.publish_to_pypi
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/

{pyopenmagnetics-1.3.12 → pyopenmagnetics-1.3.13}/CMakeLists.txt

@@ -123,12 +123,12 @@ if(NOT LOCAL_MKF_MAS)
     set(MKF_FORCE_REFRESH "2026-04-29-extra-components")
     # Tell MKF to disable matplotplusplus and use SVG-based Painter instead
     set(INCLUDE_PYMKF ON CACHE BOOL "Build Python interface" FORCE)
-    # GIT_SUBMODULES_RECURSE pulls in CAS/EAS (added 2026-04 alongside the
+    # GIT_SUBMODULES_RECURSE pulls in CAS/PEAS (added 2026-04 alongside the
     # ExtraComponentsMode API). MAS is also a submodule of MKF but PyMKF
-    # fetches it independently below for fast-update reasons; CAS/EAS only
+    # fetches it independently below for fast-update reasons; CAS/PEAS only
     # exist as MKF submodules, so we need them populated under MKF/.
     # NOTE: we cannot use GIT_SHALLOW with GIT_SUBMODULES — shallow clone
-    # skips submodule init. Drop the shallow flag for MKF so CAS/EAS/
+    # skips submodule init. Drop the shallow flag for MKF so CAS/PEAS/
     # cci_coords are actually checked out. cci_coords MUST stay in this
     # list — the CCI generator reads from MKF/cci_coords/coordinates/.
     # MAS is fetched separately below (not a sub-fetch of MKF here) so
@@ -137,7 +137,7 @@ if(NOT LOCAL_MKF_MAS)
             GIT_REPOSITORY https://github.com/OpenMagnetics/MKF.git
             GIT_TAG main
             GIT_PROGRESS TRUE
-            GIT_SUBMODULES "CAS" "EAS" "cci_coords"
+            GIT_SUBMODULES "CAS" "PEAS" "cci_coords"
             GIT_SUBMODULES_RECURSE TRUE)
 
     message(STATUS "Fetching mas")
@@ -262,14 +262,14 @@ add_custom_target(PyMASGeneration
 
 # ──────────────────────────────────────────────────────────────────
 # CAS.hpp generation (mirrors MKF/CMakeLists.txt:419-451)
-# CAS = Capacitor Adviser Schema. EAS = Element Adviser Schema.
+# CAS = Capacitor Adviser Schema. PEAS = Power Element Adviser Schema.
 # Both are submodules of MKF (added 2026-04). MKF/Topology.h #includes
 # <CAS.hpp> for the get_extra_components_inputs API; we must generate
 # the header here so PyOpenMagnetics's TU sees it.
 # ──────────────────────────────────────────────────────────────────
 set(CAS_DIRECTORY "${CMAKE_BINARY_DIR}/CAS/")
 set(CAS_DIR "${MKF_DIR}/CAS")
-set(EAS_DIR "${MKF_DIR}/EAS")
+set(PEAS_DIR "${MKF_DIR}/PEAS")
 file(MAKE_DIRECTORY "${CAS_DIRECTORY}")
 
 add_custom_command(
@@ -277,8 +277,10 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E remove -f "${CAS_DIRECTORY}/CAS.hpp"
   COMMAND quicktype -l c++ -s schema ${CAS_DIR}/schemas/inputs.json
     -S ${CAS_DIR}/schemas/inputs/designRequirements.json
-    -S ${EAS_DIR}/schemas/utils.json
-    -S ${EAS_DIR}/schemas/inputs/twoTerminalOperatingPoint.json
+    -S ${PEAS_DIR}/schemas/utils.json
+    -S ${PEAS_DIR}/schemas/inputs/twoTerminalOperatingPoint.json
+    -S ${PEAS_DIR}/schemas/inputs/operatingConditions.json
+    -S ${PEAS_DIR}/schemas/inputs/operatingPointExcitation.json
     -o ${CAS_DIRECTORY}/CAS.hpp --namespace CAS --source-style single-source
     --type-style pascal-case --member-style underscore-case
     --enumerator-style upper-underscore-case --no-boost
@@ -286,8 +288,10 @@ add_custom_command(
   DEPENDS
     "${CAS_DIR}/schemas/inputs.json"
     "${CAS_DIR}/schemas/inputs/designRequirements.json"
-    "${EAS_DIR}/schemas/utils.json"
-    "${EAS_DIR}/schemas/inputs/twoTerminalOperatingPoint.json"
+    "${PEAS_DIR}/schemas/utils.json"
+    "${PEAS_DIR}/schemas/inputs/twoTerminalOperatingPoint.json"
+    "${PEAS_DIR}/schemas/inputs/operatingConditions.json"
+    "${PEAS_DIR}/schemas/inputs/operatingPointExcitation.json"
   USES_TERMINAL)
 
 add_custom_target(PyCASGeneration

{pyopenmagnetics-1.3.12 → pyopenmagnetics-1.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyOpenMagnetics
-Version: 1.3.12
+Version: 1.3.13
 Summary: Python wrapper for OpenMagnetics
 Author-Email: Alfonso Martinez <Alfonso_VII@hotmail.com>
 Classifier: Development Status :: 4 - Beta

{pyopenmagnetics-1.3.12 → pyopenmagnetics-1.3.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "PyOpenMagnetics"
-version = "1.3.12"
+version = "1.3.13"
 requires-python = ">=3.8"
 authors = [
   { name="Alfonso Martinez", email="Alfonso_VII@hotmail.com" },

{pyopenmagnetics-1.3.12 → pyopenmagnetics-1.3.13}/src/converter.cpp

@@ -1180,14 +1180,48 @@ dispatch_extra_components(const std::string& topologyName,
 // (Lr / Cr for LLC, etc.) is populated before deck generation.
 // ─────────────────────────────────────────────────────────────────────
 namespace {
+// Apply optional bridge simulation mode override on a topology instance.
+// Must be called BEFORE topology.process() because process() consults the
+// mode when computing dead time and other timing parameters.
+//
+// modeStr accepts:
+//   "" | "default" | "pulse" | "behavioral_pulse" → no-op (BEHAVIORAL_PULSE
+//       stays as default; safe for non-bridge topologies because
+//       set_bridge_simulation_mode throws if you try to force PULSE on a
+//       non-bridge topology).
+//   "switch" | "voltage_controlled_switch" → set VOLTAGE_CONTROLLED_SWITCH,
+//       producing a real SW1/body-diode/snubber bridge instead of a single
+//       dependent V-source. Required when downstream tooling needs to size
+//       the bridge MOSFETs (e.g. Heaviside's TAS decomposer).
+//   anything else → returns false so the caller can raise a clear error.
+template <typename TopologyT>
+bool apply_bridge_simulation_mode(TopologyT& topology, const std::string& modeStr) {
+    if (modeStr.empty() || modeStr == "default" ||
+        modeStr == "pulse" || modeStr == "behavioral_pulse") {
+        return true;
+    }
+    if (modeStr == "switch" || modeStr == "voltage_controlled_switch") {
+        topology.set_bridge_simulation_mode(
+            OpenMagnetics::BridgeSimulationMode::VOLTAGE_CONTROLLED_SWITCH);
+        return true;
+    }
+    return false;
+}
+
 // Isolated topologies (transformer): pass turns ratios + magnetizing inductance.
 template <typename TopologyT>
 std::string generate_spice_isolated(const json& converterJson,
                                      const std::vector<double>& turnsRatios,
                                      double magnetizingInductance,
-                                     size_t vinIdx, size_t opIdx) {
+                                     size_t vinIdx, size_t opIdx,
+                                     const std::string& bridgeMode) {
     TopologyT topology(converterJson);
     topology._assertErrors = true;
+    if (!apply_bridge_simulation_mode(topology, bridgeMode)) {
+        throw std::runtime_error(
+            "generate_ngspice_circuit: unknown bridge_simulation_mode '" +
+            bridgeMode + "' — expected '', 'pulse', or 'switch'");
+    }
     topology.process();
     return topology.generate_ngspice_circuit(turnsRatios, magnetizingInductance, vinIdx, opIdx);
 }
@@ -1196,9 +1230,15 @@ std::string generate_spice_isolated(const json& converterJson,
 template <typename TopologyT>
 std::string generate_spice_inductor(const json& converterJson,
                                      double inductance,
-                                     size_t vinIdx, size_t opIdx) {
+                                     size_t vinIdx, size_t opIdx,
+                                     const std::string& bridgeMode) {
     TopologyT topology(converterJson);
     topology._assertErrors = true;
+    if (!apply_bridge_simulation_mode(topology, bridgeMode)) {
+        throw std::runtime_error(
+            "generate_ngspice_circuit: unknown bridge_simulation_mode '" +
+            bridgeMode + "' — expected '', 'pulse', or 'switch'");
+    }
     topology.process();
     return topology.generate_ngspice_circuit(inductance, vinIdx, opIdx);
 }
@@ -1210,9 +1250,15 @@ template <typename TopologyT>
 std::string generate_spice_isolated_scalar(const json& converterJson,
                                             const std::vector<double>& turnsRatios,
                                             double magnetizingInductance,
-                                            size_t vinIdx, size_t opIdx) {
+                                            size_t vinIdx, size_t opIdx,
+                                            const std::string& bridgeMode) {
     TopologyT topology(converterJson);
     topology._assertErrors = true;
+    if (!apply_bridge_simulation_mode(topology, bridgeMode)) {
+        throw std::runtime_error(
+            "generate_ngspice_circuit: unknown bridge_simulation_mode '" +
+            bridgeMode + "' — expected '', 'pulse', or 'switch'");
+    }
     topology.process();
     double turnsRatio = turnsRatios.empty() ? 1.0 : turnsRatios[0];
     return topology.generate_ngspice_circuit(turnsRatio, magnetizingInductance, vinIdx, opIdx);
@@ -1225,53 +1271,83 @@ json generate_ngspice_circuit(const std::string& topologyName,
                               std::vector<double> turnsRatios,
                               double magnetizingInductance,
                               size_t vinIdx,
-                              size_t opIdx) {
+                              size_t opIdx,
+                              std::string bridgeMode) {
     try {
         std::string spice;
         // Non-isolated single-inductor topologies — magnetizingInductance
         // arg is interpreted as the main inductor value.
         if (topologyName == "buck")
-            spice = generate_spice_inductor<OpenMagnetics::Buck>(converterJson, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_inductor<OpenMagnetics::Buck>(converterJson, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         else if (topologyName == "boost")
-            spice = generate_spice_inductor<OpenMagnetics::Boost>(converterJson, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_inductor<OpenMagnetics::Boost>(converterJson, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         // Isolated topologies — turnsRatios + magnetizing inductance.
-        else if (topologyName == "flyback") spice = generate_spice_isolated<OpenMagnetics::Flyback>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
-        else if (topologyName == "single_switch_forward") spice = generate_spice_isolated<OpenMagnetics::SingleSwitchForward>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
-        else if (topologyName == "two_switch_forward")    spice = generate_spice_isolated<OpenMagnetics::TwoSwitchForward>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
-        else if (topologyName == "active_clamp_forward")  spice = generate_spice_isolated<OpenMagnetics::ActiveClampForward>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
-        else if (topologyName == "push_pull") spice = generate_spice_isolated<OpenMagnetics::PushPull>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
-        else if (topologyName == "llc")       spice = generate_spice_isolated<OpenMagnetics::Llc>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
-        // CLLC is intentionally not wired here yet — its
-        // generate_ngspice_circuit signature takes (double turnsRatio,
-        // CllcResonantParameters&, ...), which doesn't fit the uniform
-        // (vector<double> turnsRatios, double Lm, ...) shape used by every
-        // other topology. Add a separate dispatch path when we need it.
-        else if (topologyName == "dab")       spice = generate_spice_isolated<OpenMagnetics::Dab>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
-        else if (topologyName == "phase_shifted_full_bridge" || topologyName == "psfb") spice = generate_spice_isolated<OpenMagnetics::Psfb>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
-        else if (topologyName == "phase_shifted_half_bridge" || topologyName == "pshb") spice = generate_spice_isolated<OpenMagnetics::Pshb>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
-        else if (topologyName == "isolated_buck")       spice = generate_spice_isolated<OpenMagnetics::IsolatedBuck>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
-        else if (topologyName == "isolated_buck_boost") spice = generate_spice_isolated<OpenMagnetics::IsolatedBuckBoost>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
+        else if (topologyName == "flyback") spice = generate_spice_isolated<OpenMagnetics::Flyback>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        else if (topologyName == "single_switch_forward") spice = generate_spice_isolated<OpenMagnetics::SingleSwitchForward>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        else if (topologyName == "two_switch_forward")    spice = generate_spice_isolated<OpenMagnetics::TwoSwitchForward>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        else if (topologyName == "active_clamp_forward")  spice = generate_spice_isolated<OpenMagnetics::ActiveClampForward>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        else if (topologyName == "push_pull") spice = generate_spice_isolated<OpenMagnetics::PushPull>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        else if (topologyName == "llc")       spice = generate_spice_isolated<OpenMagnetics::Llc>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        // CLLC has a distinct signature: generate_ngspice_circuit takes
+        // (double turnsRatio, const CllcResonantParameters&, ...) instead
+        // of the uniform (vector<double> turnsRatios, double Lm, ...)
+        // shape, because CLLC needs the full resonant-parameter set
+        // (Lr1, Cr1, Lr2, Cr2, Lm) computed by
+        // CllcConverter::calculate_resonant_parameters() — a single
+        // magnetizing inductance scalar would not determine the tank.
+        else if (topologyName == "cllc" || topologyName == "advanced_cllc") {
+            OpenMagnetics::AdvancedCllcConverter topology(converterJson);
+            topology._assertErrors = true;
+            if (!apply_bridge_simulation_mode(topology, bridgeMode)) {
+                throw std::runtime_error(
+                    "generate_ngspice_circuit: unknown bridge_simulation_mode '" +
+                    bridgeMode + "' — expected '', 'pulse', or 'switch'");
+            }
+            topology.process();
+            auto params = topology.calculate_resonant_parameters();
+            double turnsRatio = turnsRatios.empty() ? 1.0 : turnsRatios[0];
+            spice = topology.generate_ngspice_circuit(turnsRatio, params, vinIdx, opIdx);
+        }
+        else if (topologyName == "dab")       spice = generate_spice_isolated<OpenMagnetics::Dab>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        else if (topologyName == "phase_shifted_full_bridge" || topologyName == "psfb") spice = generate_spice_isolated<OpenMagnetics::Psfb>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        else if (topologyName == "phase_shifted_half_bridge" || topologyName == "pshb") spice = generate_spice_isolated<OpenMagnetics::Pshb>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        else if (topologyName == "isolated_buck")       spice = generate_spice_isolated<OpenMagnetics::IsolatedBuck>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        else if (topologyName == "isolated_buck_boost") spice = generate_spice_isolated<OpenMagnetics::IsolatedBuckBoost>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         // Single-inductor non-isolated (2026-05): Cuk, Sepic, Zeta, FSBB.
         else if (topologyName == "cuk" || topologyName == "advanced_cuk")
-            spice = generate_spice_inductor<OpenMagnetics::Cuk>(converterJson, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_inductor<OpenMagnetics::Cuk>(converterJson, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         else if (topologyName == "sepic" || topologyName == "advanced_sepic")
-            spice = generate_spice_inductor<OpenMagnetics::Sepic>(converterJson, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_inductor<OpenMagnetics::Sepic>(converterJson, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         else if (topologyName == "zeta" || topologyName == "advanced_zeta")
-            spice = generate_spice_inductor<OpenMagnetics::Zeta>(converterJson, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_inductor<OpenMagnetics::Zeta>(converterJson, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         else if (topologyName == "four_switch_buck_boost" || topologyName == "advanced_four_switch_buck_boost")
-            spice = generate_spice_inductor<OpenMagnetics::FourSwitchBuckBoost>(converterJson, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_inductor<OpenMagnetics::FourSwitchBuckBoost>(converterJson, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         // Isolated with vector turns ratios (2026-05): AsymHB, Clllc, Src, Vienna.
         else if (topologyName == "asymmetric_half_bridge" || topologyName == "advanced_asymmetric_half_bridge")
-            spice = generate_spice_isolated<OpenMagnetics::AsymmetricHalfBridge>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_isolated<OpenMagnetics::AsymmetricHalfBridge>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         else if (topologyName == "clllc" || topologyName == "advanced_clllc")
-            spice = generate_spice_isolated<OpenMagnetics::Clllc>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_isolated<OpenMagnetics::Clllc>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         else if (topologyName == "src" || topologyName == "advanced_src")
-            spice = generate_spice_isolated<OpenMagnetics::Src>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_isolated<OpenMagnetics::Src>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         else if (topologyName == "vienna" || topologyName == "advanced_vienna")
-            spice = generate_spice_isolated<OpenMagnetics::Vienna>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_isolated<OpenMagnetics::Vienna>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
         // Isolated with scalar turns ratio (single secondary): Weinberg.
         else if (topologyName == "weinberg" || topologyName == "advanced_weinberg")
-            spice = generate_spice_isolated_scalar<OpenMagnetics::Weinberg>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx);
+            spice = generate_spice_isolated_scalar<OpenMagnetics::Weinberg>(converterJson, turnsRatios, magnetizingInductance, vinIdx, opIdx, bridgeMode);
+        // PFC has a distinct method signature — (inductance, dcResistance,
+        // simulationTime, timeStep) — because its deck simulates over a
+        // line cycle rather than a switching cycle. Use the method's
+        // defaults for dcResistance/simulationTime/timeStep; vinIdx/opIdx
+        // are not meaningful for PFC (line voltage drives the operating
+        // point).
+        else if (topologyName == "power_factor_correction"
+              || topologyName == "advanced_power_factor_correction"
+              || topologyName == "pfc") {
+            OpenMagnetics::PowerFactorCorrection topology(converterJson);
+            topology._assertErrors = true;
+            topology.process();
+            spice = topology.generate_ngspice_circuit(magnetizingInductance);
+        }
         else return json{{"error", "generate_ngspice_circuit: unknown topology '" + topologyName + "'"}};
         return json{{"netlist", spice}};
     } catch (const std::exception& exc) {
@@ -1367,7 +1443,8 @@ void register_converter_bindings(py::module& m) {
         "populated. Returns {'netlist': '<spice>'} or {'error': '...'}.",
         py::arg("topology_name"), py::arg("converter_json"),
         py::arg("turns_ratios"), py::arg("magnetizing_inductance"),
-        py::arg("vin_index") = 0, py::arg("op_index") = 0);
+        py::arg("vin_index") = 0, py::arg("op_index") = 0,
+        py::arg("bridge_simulation_mode") = std::string(""));
 
     m.def("get_extra_components_inputs", &get_extra_components_inputs,
         "Return the design requirements for extra components a topology brings "

{pyopenmagnetics-1.3.12 → pyopenmagnetics-1.3.13}/src/settings.cpp

@@ -161,6 +161,9 @@ json get_settings() {
         settingsJson["coreAdviserIncludeMargin"] = OpenMagnetics::settings.get_core_adviser_include_margin();
         settingsJson["coreAdviserEnableIntermediatePruning"] = OpenMagnetics::settings.get_core_adviser_enable_intermediate_pruning();
         settingsJson["coreAdviserMaximumMagneticsAfterFiltering"] = OpenMagnetics::settings.get_core_adviser_maximum_magnetics_after_filtering();
+        settingsJson["coreAdviserEnableTemperatureFilter"] = OpenMagnetics::settings.get_core_adviser_enable_temperature_filter();
+        settingsJson["coreAdviserMaximumTemperature"] = OpenMagnetics::settings.get_core_adviser_maximum_temperature();
+        settingsJson["coreAdviserSaturationMargin"] = OpenMagnetics::settings.get_core_adviser_saturation_margin();
         {
             json aux;
             to_json(aux, OpenMagnetics::settings.get_gapping_strategy());
@@ -347,6 +350,9 @@ void set_settings(json settingsJson) {
         if (settingsJson.contains("coreAdviserIncludeMargin")) OpenMagnetics::settings.set_core_adviser_include_margin(settingsJson["coreAdviserIncludeMargin"]);
         if (settingsJson.contains("coreAdviserEnableIntermediatePruning")) OpenMagnetics::settings.set_core_adviser_enable_intermediate_pruning(settingsJson["coreAdviserEnableIntermediatePruning"]);
         if (settingsJson.contains("coreAdviserMaximumMagneticsAfterFiltering")) OpenMagnetics::settings.set_core_adviser_maximum_magnetics_after_filtering(settingsJson["coreAdviserMaximumMagneticsAfterFiltering"]);
+        if (settingsJson.contains("coreAdviserEnableTemperatureFilter")) OpenMagnetics::settings.set_core_adviser_enable_temperature_filter(settingsJson["coreAdviserEnableTemperatureFilter"]);
+        if (settingsJson.contains("coreAdviserMaximumTemperature")) OpenMagnetics::settings.set_core_adviser_maximum_temperature(settingsJson["coreAdviserMaximumTemperature"]);
+        if (settingsJson.contains("coreAdviserSaturationMargin")) OpenMagnetics::settings.set_core_adviser_saturation_margin(settingsJson["coreAdviserSaturationMargin"]);
         if (settingsJson.contains("gappingStrategy")) {
             GappingOptimizationStrategy strategy;
             from_json(settingsJson["gappingStrategy"], strategy);