PyOpenMagnetics 1.4.2__tar.gz → 1.4.4__tar.gz

pyopenmagnetics-1.4.4/.gitignore

@@ -0,0 +1,19 @@
+build/
+dist/
+venv/
+.venv/
+.venv311/
+
+*.pyc
+__pycache__/
+# LOCAL_MKF_DIR build symlinks + stray tooling — never package into the wheel
+_mkf_local
+_mas_local
+opencodetmp
+output
+.claude
+BUG.md
+PARITY_PORT_PHASES_B_C_D.md
+PyOpenMagnetics.generated.pyi
+test.svg
+test.svg_temp.svg

{pyopenmagnetics-1.4.2 → pyopenmagnetics-1.4.4}/CMakeLists.txt

@@ -182,11 +182,27 @@ if(NOT LOCAL_MKF_MAS)
         message(STATUS "MAS git error: ${MAS_GIT_ERROR}")
     endif()
 
-    if(NOT MKF_POPULATED)
-        message(STATUS "Populating MKF")
-        FetchContent_Populate(MKF)
-    else()
-        message(STATUS "MKF already populated at: ${MKF_SOURCE_DIR}")
+    # Always delete and repopulate MKF to ensure we get the latest main,
+    # mirroring the MAS refresh above. FetchContent will NOT re-fetch an
+    # already-cloned source dir even with GIT_TAG main, so a persisted build
+    # dir (incremental CI cache, local rebuilds) otherwise keeps a STALE MKF
+    # checkout — fixes merged to MKF main would silently never reach the wheel.
+    if(EXISTS ${CMAKE_BINARY_DIR}/_deps/mkf-src)
+        message(STATUS "Removing old MKF source to force fresh clone")
+        file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/mkf-src)
+    endif()
+    message(STATUS "Populating MKF")
+    FetchContent_Populate(MKF)
+    # Show git log to verify we built against MKF main HEAD
+    execute_process(
+        COMMAND git -C ${mkf_SOURCE_DIR} log --oneline -1
+        OUTPUT_VARIABLE MKF_GIT_LOG
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_VARIABLE MKF_GIT_ERROR
+    )
+    message(STATUS "MKF version: ${MKF_GIT_LOG}")
+    if(MKF_GIT_ERROR)
+        message(STATUS "MKF git error: ${MKF_GIT_ERROR}")
     endif()
 
     message(STATUS ${MAS_SOURCE_DIR})
@@ -210,6 +226,7 @@ add_custom_command(
     -S ${MAS_DIR}/schemas/magnetic/core/gap.json
     -S ${MAS_DIR}/schemas/magnetic/core/shape.json
     -S ${MAS_DIR}/schemas/magnetic/core/material.json
+    -S ${MAS_DIR}/schemas/magnetic/core/coating.json
     -S ${MAS_DIR}/schemas/magnetic/insulation/material.json
     -S ${MAS_DIR}/schemas/magnetic/insulation/wireCoating.json
     -S ${MAS_DIR}/schemas/magnetic/bobbin.json

{pyopenmagnetics-1.4.2 → pyopenmagnetics-1.4.4}/PKG-INFO

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

{pyopenmagnetics-1.4.2 → pyopenmagnetics-1.4.4}/pyproject.toml

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

{pyopenmagnetics-1.4.2 → pyopenmagnetics-1.4.4}/src/converter.cpp

@@ -941,6 +941,20 @@ json design_magnetics_from_converter(
                 ? magneticAdviser.get_advised_magnetic_from_converter(converter, maxResults)
                 : magneticAdviser.get_advised_magnetic_from_converter(converter, weights, maxResults);
         }
+        else if (topologyName == "phase_shifted_full_bridge" || topologyName == "psfb" ||
+                 topologyName == "advanced_phase_shifted_full_bridge" || topologyName == "advanced_psfb") {
+            // Use the basic Psfb converter (mirrors the AHB / LLC branches):
+            // its process_design_requirements() derives turns ratios and
+            // magnetizing inductance from the converter spec. Falling through
+            // to the generic else branch would dispatch to AdvancedPsfb, whose
+            // from_json requires desiredTurnsRatios / desiredMagnetizingInductance
+            // (the design *outputs*), which a plain converter spec does not carry.
+            OpenMagnetics::Psfb converter(converterJson);
+            converter._assertErrors = true;
+            masMagnetics = weights.empty()
+                ? magneticAdviser.get_advised_magnetic_from_converter(converter, maxResults)
+                : magneticAdviser.get_advised_magnetic_from_converter(converter, weights, maxResults);
+        }
         else if (topologyName == "weinberg" || topologyName == "advanced_weinberg") {
             OpenMagnetics::Weinberg converter(converterJson);
             converter._assertErrors = true;
@@ -969,6 +983,18 @@ json design_magnetics_from_converter(
                 ? magneticAdviser.get_advised_magnetic_from_converter(converter, maxResults)
                 : magneticAdviser.get_advised_magnetic_from_converter(converter, weights, maxResults);
         }
+        else if (topologyName == "dab" || topologyName == "advanced_dab" ||
+                 topologyName == "dual_active_bridge") {
+            // Use the base Dab model (mirrors llc / src / clllc above): it
+            // derives turns ratios + magnetizing inductance itself from the
+            // V1/V2 windows, so it does not require the AdvancedDab
+            // desiredTurnsRatios / desiredMagnetizingInductance inputs.
+            OpenMagnetics::Dab converter(converterJson);
+            converter._assertErrors = true;
+            masMagnetics = weights.empty()
+                ? magneticAdviser.get_advised_magnetic_from_converter(converter, maxResults)
+                : magneticAdviser.get_advised_magnetic_from_converter(converter, weights, maxResults);
+        }
         else {
             // Fall back to old approach for other topologies
             json inputsJson = process_converter_internal(topologyName, converterJson, useNgspice);

{pyopenmagnetics-1.4.2 → pyopenmagnetics-1.4.4}/src/simulation.cpp

@@ -325,6 +325,21 @@ json sweep_impedance_over_frequency(json magneticJson, double start, double stop
     }
 }
 
+json sweep_differential_mode_impedance_over_frequency(json magneticJson, double start, double stop, size_t numberElements, std::string mode, std::string title) {
+    try {
+        OpenMagnetics::Magnetic magnetic(magneticJson);
+        auto result = OpenMagnetics::Sweeper::sweep_differential_mode_impedance_over_frequency(magnetic, start, stop, numberElements, mode, title);
+        json resultJson;
+        to_json(resultJson, result);
+        return resultJson;
+    }
+    catch (const std::exception &exc) {
+        json exception;
+        exception["data"] = "Exception: " + std::string{exc.what()};
+        return exception;
+    }
+}
+
 json sweep_q_factor_over_frequency(json magneticJson, double start, double stop, size_t numberElements, std::string mode, std::string title) {
     try {
         OpenMagnetics::Magnetic magnetic(magneticJson);
@@ -812,6 +827,15 @@ void register_simulation_bindings(py::module& m) {
         py::arg("title"),
         "Sweep impedance over a frequency range.");
 
+    m.def("sweep_differential_mode_impedance_over_frequency", &sweep_differential_mode_impedance_over_frequency,
+        py::arg("magnetic_json"),
+        py::arg("start"),
+        py::arg("stop"),
+        py::arg("number_elements"),
+        py::arg("mode"),
+        py::arg("title"),
+        "Sweep differential-mode impedance (leakage + winding R + inter-winding C) over a frequency range.");
+
     m.def("sweep_q_factor_over_frequency", &sweep_q_factor_over_frequency,
         py::arg("magnetic_json"),
         py::arg("start"),

{pyopenmagnetics-1.4.2 → pyopenmagnetics-1.4.4}/src/simulation.h

@@ -36,6 +36,7 @@ json calculate_capacitance_models_between_windings(double energy, double voltage
 
 // Sweep functions
 json sweep_impedance_over_frequency(json magneticJson, double start, double stop, size_t numberElements, std::string mode, std::string title);
+json sweep_differential_mode_impedance_over_frequency(json magneticJson, double start, double stop, size_t numberElements, std::string mode, std::string title);
 json sweep_q_factor_over_frequency(json magneticJson, double start, double stop, size_t numberElements, std::string mode, std::string title);
 json sweep_winding_resistance_over_frequency(json magneticJson, double start, double stop, size_t numberElements, size_t windingIndex, double temperature, std::string mode, std::string title);
 json sweep_resistance_over_frequency(json magneticJson, double start, double stop, size_t numberElements, double temperature, std::string mode, std::string title);

pyopenmagnetics-1.4.2/.gitignore

@@ -1,6 +0,0 @@
-build/
-dist/
-venv/
-
-*.pyc
-__pycache__/