kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Core] add quantity Magnetization

Browse Source 
- needed for FEM and Material
This commit is contained in:
Uwe
2023-02-08 06:23:35 +01:00
parent b41776d077
commit 201b95a5b2
7 changed files with 76 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/App/Application.cpp
View File

@@ -1916,6 +1916,7 @@ void Application::initTypes()
App::PropertyPressure ::init();
App::PropertyCurrentDensity ::init();
App::PropertyElectricPotential ::init();
App::PropertyMagnetization ::init();
App::PropertyVacuumPermittivity ::init();
App::PropertyInteger ::init();
App::PropertyIntegerConstraint ::init();

11
src/App/PropertyUnits.cpp
View File

@@ -309,6 +309,17 @@ PropertyLength::PropertyLength()
setConstraints(&LengthStandard);
}
//**************************************************************************
//**************************************************************************
// PropertyMagnetization
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TYPESYSTEM_SOURCE(App::PropertyMagnetization, App::PropertyQuantity)
PropertyMagnetization::PropertyMagnetization()
{
setUnit(Base::Unit::Magnetization);
}
//**************************************************************************
//**************************************************************************

13
src/App/PropertyUnits.h
View File

@@ -237,6 +237,19 @@ public:
~PropertyLength() override = default;
};
/** Magnetization property
* This is a property for representing magnetizations. It is basically a float
* property. On the Gui it has a quantity like A/m.
*/
class AppExport PropertyMagnetization: public PropertyQuantityConstraint
{
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
PropertyMagnetization();
~PropertyMagnetization() override = default;
};
/** Pressure property
* This is a property for representing acceleration. It is basically a float
* property. On the Gui it has a quantity like m/s^2.

81
src/Base/Unit.cpp
View File

@@ -426,85 +426,87 @@ QString Unit::getString() const
QString Unit::getTypeString() const
{
if(*this == Unit::Length )
if (*this == Unit::Length)
return QString::fromLatin1("Length");
if(*this == Unit::Area )
if (*this == Unit::Area)
return QString::fromLatin1("Area");
if(*this == Unit::Volume )
if (*this == Unit::Volume)
return QString::fromLatin1("Volume");
if(*this == Unit::Mass )
if (*this == Unit::Mass)
return QString::fromLatin1("Mass");
if(*this == Unit::Angle )
if (*this == Unit::Angle)
return QString::fromLatin1("Angle");
if(*this == Unit::Density )
if (*this == Unit::Density)
return QString::fromLatin1("Density");
if(*this == Unit::TimeSpan )
if (*this == Unit::TimeSpan)
return QString::fromLatin1("TimeSpan");
if(*this == Unit::Frequency )
if (*this == Unit::Frequency)
return QString::fromLatin1("Frequency");
if(*this == Unit::Velocity )
if (*this == Unit::Velocity)
return QString::fromLatin1("Velocity");
if(*this == Unit::Acceleration )
if (*this == Unit::Acceleration)
return QString::fromLatin1("Acceleration");
if(*this == Unit::Temperature )
if (*this == Unit::Temperature)
return QString::fromLatin1("Temperature");
if (*this == Unit::CurrentDensity)
return QString::fromLatin1("CurrentDensity");
if(*this == Unit::ElectricCurrent )
if (*this == Unit::ElectricCurrent)
return QString::fromLatin1("ElectricCurrent");
if(*this == Unit::ElectricPotential )
if (*this == Unit::ElectricPotential)
return QString::fromLatin1("ElectricPotential");
if(*this == Unit::ElectricCharge )
if (*this == Unit::ElectricCharge)
return QString::fromLatin1("ElectricCharge");
if(*this == Unit::MagneticFieldStrength )
if (*this == Unit::MagneticFieldStrength)
return QString::fromLatin1("MagneticFieldStrength");
if(*this == Unit::MagneticFlux )
if (*this == Unit::MagneticFlux)
return QString::fromLatin1("MagneticFlux");
if(*this == Unit::MagneticFluxDensity )
if (*this == Unit::MagneticFluxDensity)
return QString::fromLatin1("MagneticFluxDensity");
if(*this == Unit::ElectricalCapacitance )
if (*this == Unit::Magnetization)
return QString::fromLatin1("Magnetization");
if (*this == Unit::ElectricalCapacitance)
return QString::fromLatin1("ElectricalCapacitance");
if(*this == Unit::ElectricalInductance )
if (*this == Unit::ElectricalInductance)
return QString::fromLatin1("ElectricalInductance");
if(*this == Unit::ElectricalConductance )
if (*this == Unit::ElectricalConductance)
return QString::fromLatin1("ElectricalConductance");
if(*this == Unit::ElectricalResistance )
if (*this == Unit::ElectricalResistance)
return QString::fromLatin1("ElectricalResistance");
if(*this == Unit::ElectricalConductivity )
if (*this == Unit::ElectricalConductivity)
return QString::fromLatin1("ElectricalConductivity");
if(*this == Unit::AmountOfSubstance )
if (*this == Unit::AmountOfSubstance)
return QString::fromLatin1("AmountOfSubstance");
if(*this == Unit::LuminousIntensity )
if (*this == Unit::LuminousIntensity)
return QString::fromLatin1("LuminousIntensity");
if(*this == Unit::Pressure )
if (*this == Unit::Pressure)
return QString::fromLatin1("Pressure");
if(*this == Unit::Force )
if (*this == Unit::Force)
return QString::fromLatin1("Force");
if(*this == Unit::Work )
if (*this == Unit::Work)
return QString::fromLatin1("Work");
if(*this == Unit::Power )
if (*this == Unit::Power)
return QString::fromLatin1("Power");
if(*this == Unit::Stiffness )
if (*this == Unit::Stiffness)
return QString::fromLatin1("Stiffness");
if(*this == Unit::SpecificEnergy )
if (*this == Unit::SpecificEnergy)
return QString::fromLatin1("SpecificEnergy");
if(*this == Unit::ThermalConductivity )
if (*this == Unit::ThermalConductivity)
return QString::fromLatin1("ThermalConductivity");
if(*this == Unit::ThermalExpansionCoefficient )
if (*this == Unit::ThermalExpansionCoefficient)
return QString::fromLatin1("ThermalExpansionCoefficient");
if(*this == Unit::VolumetricThermalExpansionCoefficient )
if (*this == Unit::VolumetricThermalExpansionCoefficient)
return QString::fromLatin1("VolumetricThermalExpansionCoefficient");
if(*this == Unit::SpecificHeat )
if (*this == Unit::SpecificHeat)
return QString::fromLatin1("SpecificHeat");
if(*this == Unit::ThermalTransferCoefficient )
if (*this == Unit::ThermalTransferCoefficient)
return QString::fromLatin1("ThermalTransferCoefficient");
if(*this == Unit::HeatFlux )
if (*this == Unit::HeatFlux)
return QString::fromLatin1("HeatFlux");
if(*this == Unit::DynamicViscosity )
if (*this == Unit::DynamicViscosity)
return QString::fromLatin1("DynamicViscosity");
if(*this == Unit::KinematicViscosity )
if (*this == Unit::KinematicViscosity)
return QString::fromLatin1("KinematicViscosity");
if(*this == Unit::VacuumPermittivity )
if (*this == Unit::VacuumPermittivity)
return QString::fromLatin1("VacuumPermittivity");
return QString();
@@ -535,6 +537,7 @@ Unit Unit::ElectricCharge(0,0,1,1);
Unit Unit::MagneticFieldStrength(-1,0,0,1);
Unit Unit::MagneticFlux(2,1,-2,-1);
Unit Unit::MagneticFluxDensity(0,1,-2,-1);
Unit Unit::Magnetization(-1,0,0,1);
Unit Unit::ElectricalCapacitance(-2,-1,4,2);
Unit Unit::ElectricalInductance(2,1,-2,-2);
Unit Unit::ElectricalConductance(-2,-1,3,2);

1
src/Base/Unit.h
View File

@@ -114,6 +114,7 @@ public:
static Unit MagneticFieldStrength;
static Unit MagneticFlux;
static Unit MagneticFluxDensity;
static Unit Magnetization;
static Unit ElectricalCapacitance;
static Unit ElectricalInductance;
static Unit ElectricalConductance;

4
src/Base/UnitsSchemaInternal.cpp
View File

@@ -359,6 +359,10 @@ QString UnitsSchemaInternal::schemaTranslate(const Quantity &quant, double &fact
unitString = QString::fromLatin1("Wb");
factor = 1e6;
}
else if (unit == Unit::Magnetization) {
unitString = QString::fromLatin1("A/m");
factor = 1e-3;
}
else if (unit == Unit::ElectricalConductance) {
if (UnitValue < 1e-9) {
unitString = QString::fromUtf8("\xC2\xB5S");

4
src/Base/UnitsSchemaMKS.cpp
View File

@@ -307,6 +307,10 @@ QString UnitsSchemaMKS::schemaTranslate(const Quantity &quant, double &factor, Q
unitString = QString::fromLatin1("Wb");
factor = 1e6;
}
else if (unit == Unit::Magnetization) {
unitString = QString::fromLatin1("A/m");
factor = 1e-3;
}
else if (unit == Unit::ElectricalConductance) {
if (UnitValue < 1e-9) {
unitString = QString::fromUtf8("\xC2\xB5S");