Changeset 897

Show
Ignore:
Timestamp:
12/08/2007 09:33:55 AM (13 months ago)
Author:
otter
Message:

Conversion script improved / bugs fixed

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • Modelica/trunk/Modelica/Scripts/ConvertModelica_from_2.2.2_to_3.0.mos

    r891 r897  
    110110convertModifiers("Modelica.Mechanics.MultiBody.Parts.BodyBox"     ,{"density"}, {"density=%density%*1000"}); 
    111111convertModifiers("Modelica.Mechanics.MultiBody.Parts.BodyCylinder",{"density"}, {"density=%density%*1000"}); 
     112 
     113 
     114 
     115// --------- Modelica.Blocks - Change of start values --------------------------------------------------- 
     116convertModifiers("Modelica.Blocks.Continuous.TransferFunction",{"a={1,1}"}, {"a=%a%"}); 
     117 
     118convertModifiers("Modelica.Blocks.Continuous.StateSpace",{"A=[1, 0; 0, 1]"}, {"A=%A%"}); 
     119convertModifiers("Modelica.Blocks.Continuous.StateSpace",{"B=[1; 1]"}      , {"B=%B%"}); 
     120convertModifiers("Modelica.Blocks.Continuous.StateSpace",{"C=[1, 1]"}      , {"C=%C%"}); 
     121 
     122convertModifiers("Modelica.Blocks.Discrete.TransferFunction",{"a={1,1}"}, {"a=%a%"}); 
     123 
     124convertModifiers("Modelica.Blocks.Discrete.StateSpace",{"A=[1, 0; 0, 1]"}, {"A=%A%"}); 
     125convertModifiers("Modelica.Blocks.Discrete.StateSpace",{"B=[1; 1]"}      , {"B=%B%"}); 
     126convertModifiers("Modelica.Blocks.Discrete.StateSpace",{"C=[1, 1]"}      , {"C=%C%"}); 
    112127 
    113128 
    … …  
    761776 
    762777 
     778// --------- MultiBody ----------------------------------------------------------- 
     779 
     780convertModifiers({"Modelica.Mechanics.MultiBody.Sensors.CutForce"}, 
     781                 {"cardinality(frame_resolve)=0", "resolveInFrame_a=true"}, 
     782                 {"resolveInFrame = if (%resolveInFrame_a%) then " +  
     783                                    "Modelica.Mechanics.MultiBody.Types.ResolveInFrame2.frame_a else " +  
     784                                    "Modelica.Mechanics.MultiBody.Types.ResolveInFrame2.world"}, true); 
     785convertModifiers({"Modelica.Mechanics.MultiBody.Sensors.CutForce"}, 
     786                 {"cardinality(frame_resolve)=1"},{"resolveInFrame=Modelica.Mechanics.MultiBody.Types.ResolveInFrame2.frame_resolve"}); 
     787 
     788convertModifiers({"Modelica.Mechanics.MultiBody.Sensors.CutTorque"}, 
     789                 {"cardinality(frame_resolve)=0", "resolveInFrame_a=true"}, 
     790                 {"resolveInFrame = if (%resolveInFrame_a%) then " +  
     791                                    "Modelica.Mechanics.MultiBody.Types.ResolveInFrame2.frame_a else " +  
     792                                    "Modelica.Mechanics.MultiBody.Types.ResolveInFrame2.world"}, true); 
     793convertModifiers({"Modelica.Mechanics.MultiBody.Sensors.CutTorque"}, 
     794                 {"cardinality(frame_resolve)=1"},{"resolveInFrame=Modelica.Mechanics.MultiBody.Types.ResolveInFrame2.frame_resolve"}); 
     795 
     796convertClass  ("Modelica.Mechanics.MultiBody.Sensors.CutForceAndTorque", 
     797               "ObsoleteModelica3.Mechanics.MultiBody.Sensors.CutForceAndTorque"); 
     798 
     799 
     800 
    763801//-------- Electrical ------------------------------------------------------------ 
    764802convertElement({"Modelica.Electrical.Analog.Basic.EMF"}, "flange_b", "shaft"); 
    765803 
     804convertClass  ("Modelica.Electrical.Analog.Basic.HeatingResistor", 
     805               "ObsoleteModelica3.Electrical.Analog.Basic.HeatingResistor"); 
     806convertClassIf("Modelica.Electrical.Analog.Basic.HeatingResistor", "heatPort", "connect", 
     807               "Modelica.Electrical.Analog.Basic.HeatingResistor"); 
    766808 
    767809 
    … …  
    10971139convertClass  ("Modelica.Mechanics.Rotational.QuadraticSpeedDependentTorque",  "Modelica.Mechanics.Rotational.Sources.QuadraticSpeedDependentTorque"); 
    10981140convertClass  ("Modelica.Mechanics.Rotational.ConstantTorque",                 "Modelica.Mechanics.Rotational.Sources.ConstantTorque"); 
     1141convertClass  ("Modelica.Mechanics.Rotational.TorqueStep",                     "Modelica.Mechanics.Rotational.Sources.TorqueStep"); 
    10991142convertClass  ("Modelica.Mechanics.Rotational.ConstantSpeed",                  "Modelica.Mechanics.Rotational.Sources.ConstantSpeed"); 
    11001143convertClass  ("Modelica.Mechanics.Rotational.RelativeStates",                 "Modelica.Mechanics.Rotational.Sources.RelativeStates");