Merge pull request #40 from ORNL-Modelica/devel

resave as directories
ORNL-Modelica · Nov 13, 2018 · 1e3b377 · 1e3b377
2 parents fe04bae + 806de4e
commit 1e3b377
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 70 deletions.
diff --git a/TRANSFORM/Nuclear/DoseCalculations/Examples/AverageSoftTissueDose_C14.mo b/TRANSFORM/Nuclear/DoseCalculations/Examples/AverageSoftTissueDose_C14.mo
@@ -1,7 +1,6 @@
 within TRANSFORM.Nuclear.DoseCalculations.Examples;
 model AverageSoftTissueDose_C14
 
-
   Dose_AlphaBetaTissue dose(A=1.2e5/0.05, E_bar=
         SIadd.Conversions.Functions.Energy_J.from_MeV(0.0495))
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));

diff --git a/TRANSFORM/Units/Conversions/Functions/Activity_Bq/package.mo b/TRANSFORM/Units/Conversions/Functions/Activity_Bq/package.mo
@@ -1,10 +1,4 @@
 within TRANSFORM.Units.Conversions.Functions;
 package Activity_Bq "Conversions for activity (e.g., bequeral, curies). SI unit is [Bq], i.e., [1/s]"
 
-  function to_Bq "Activity: [Bq] -> [Bq]"
-    extends BaseClasses.to;
-
-  algorithm
-    y := u;
-  end to_Bq;
 end Activity_Bq;
diff --git a/TRANSFORM/Units/Conversions/Functions/Activity_Bq/to_Bq.mo b/TRANSFORM/Units/Conversions/Functions/Activity_Bq/to_Bq.mo
@@ -0,0 +1,7 @@
+within TRANSFORM.Units.Conversions.Functions.Activity_Bq;
+function to_Bq "Activity: [Bq] -> [Bq]"
+  extends BaseClasses.to;
+
+algorithm
+  y := u;
+end to_Bq;
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/from.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/from.mo
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/package.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/package.mo
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/package.order b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/package.order
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/to.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/to.mo
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/from_Bq.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/from_Bq.mo
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/from_Ci.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/from_Ci.mo
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/package.order b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/package.order
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/to_Bq.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/to_Bq.mo
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/to_Ci.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/to_Ci.mo
diff --git a/TRANSFORM/Units/Dose.mo b/TRANSFORM/Units/Dose.mo
@@ -0,0 +1,2 @@
+within TRANSFORM.Units;
+type Dose = Real (final unit="J/kg", final quantity= "Dose") "Dose [J/kg]";
diff --git a/TRANSFORM/Units/DoseRate.mo b/TRANSFORM/Units/DoseRate.mo
@@ -0,0 +1,3 @@
+within TRANSFORM.Units;
+type DoseRate =Real (final unit="J/(s.kg)", final quantity= "DoseRate")
+  "Dose rate [J/(kg.s)]";
diff --git a/TRANSFORM/Units/SpecificActivity.mo b/TRANSFORM/Units/SpecificActivity.mo
@@ -0,0 +1,3 @@
+within TRANSFORM.Units;
+type SpecificActivity = Real (final unit="1/(s.kg)", final quantity= "SpecificActivity")
+  "Specific activity [1/(s.kg)]";
diff --git a/TRANSFORM/Units/StoppingPowerParticle.mo b/TRANSFORM/Units/StoppingPowerParticle.mo
@@ -0,0 +1,3 @@
+within TRANSFORM.Units;
+type StoppingPowerParticle =Real (final unit="J/m", final quantity= "StoppingPowerParticle")
+  "Stopping power for particles [J/m]";
diff --git a/TRANSFORM/Units/package.mo b/TRANSFORM/Units/package.mo
@@ -3,14 +3,7 @@ package Units "Additional models, functions, types, etc. for units"
   extends TRANSFORM.Icons.UnitsPackage;
 
 
-  type SpecificActivity = Real (final unit="1/(s.kg)", final quantity= "SpecificActivity")
-    "Specific activity [1/(s.kg)]";
 
-  type Dose = Real (final unit="J/kg", final quantity= "Dose") "Dose [J/kg]";
 
-  type DoseRate =Real (final unit="J/(s.kg)", final quantity= "DoseRate")
-    "Dose rate [J/(kg.s)]";
 
-  type StoppingPowerParticle =Real (final unit="J/m", final quantity= "StoppingPowerParticle")
-    "Stopping power for particles [J/m]";
 end Units;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		within TRANSFORM.Units;
		type Dose = Real (final unit="J/kg", final quantity= "Dose") "Dose [J/kg]";