Changeset 447

Timestamp:

11/27/15 01:05:57 (9 years ago)

Author:

Maciej Komosinski

Message:

Renamed scale() to micronsToFrams()

File:

• experiments/frams/foraminifera/data/scripts/foraminifera.expdef (modified) (4 diffs)

experiments/frams/foraminifera/data/scripts/foraminifera.expdef

@@ -75 +75 @@
         SignalView.mode = 1;
         World.wrldwat = 200;
-        World.wrldsiz = scale(40000);
+        World.wrldsiz = micronsToFrams(40000);
         World.wrldbnd = 1;
         ExpParams.stress = 1;
@@ -94 +94 @@
         //morphology
         dir_change = 500;
-        ExpParams.zone1_range = scale(3000);
-        ExpParams.zone2_range = scale(6000);
+        ExpParams.zone1_range = micronsToFrams(3000);
+        ExpParams.zone2_range = micronsToFrams(6000);
         init_chambers();
-        ExpParams.chamber_proculus_haplo = scale(50);
+        ExpParams.chamber_proculus_haplo = micronsToFrams(50);
         ExpParams.chamber_difference_haplo = 0.0;
-        ExpParams.chamber_proculus_diplo = scale(20);
+        ExpParams.chamber_proculus_diplo = micronsToFrams(20);
         ExpParams.chamber_difference_diplo = 0.2;
         max_chamber_energ = [Vector.new(), Vector.new()];
@@ -125 +125 @@
 
         //nutrients
-        ExpParams.nutrientsize = scale(10);
+        ExpParams.nutrientsize = micronsToFrams(10);
         ExpParams.energy_nut = 100 * Math.pow(ExpParams.nutrientsize, 3);
         ExpParams.nutrientPop = 1;
@@ -136 +136 @@
 @include "standard_placement.inc"
 
-function scale(micrometers) //micrometers to framsticks world units
+function micronsToFrams(micrometers)
 {
         return micrometers*0.025;
 }
 
-function framsToMicrons(framsworldunits) //...and back ^^^
+function framsToMicrons(framsworldunits)
 {
         return framsworldunits/0.025;