Changeset 447 for experiments


Ignore:
Timestamp:
11/27/15 01:05:57 (8 years ago)
Author:
Maciej Komosinski
Message:

Renamed scale() to micronsToFrams()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • experiments/frams/foraminifera/data/scripts/foraminifera.expdef

    r445 r447  
    7575        SignalView.mode = 1;
    7676        World.wrldwat = 200;
    77         World.wrldsiz = scale(40000);
     77        World.wrldsiz = micronsToFrams(40000);
    7878        World.wrldbnd = 1;
    7979        ExpParams.stress = 1;
     
    9494        //morphology
    9595        dir_change = 500;
    96         ExpParams.zone1_range = scale(3000);
    97         ExpParams.zone2_range = scale(6000);
     96        ExpParams.zone1_range = micronsToFrams(3000);
     97        ExpParams.zone2_range = micronsToFrams(6000);
    9898        init_chambers();
    99         ExpParams.chamber_proculus_haplo = scale(50);
     99        ExpParams.chamber_proculus_haplo = micronsToFrams(50);
    100100        ExpParams.chamber_difference_haplo = 0.0;
    101         ExpParams.chamber_proculus_diplo = scale(20);
     101        ExpParams.chamber_proculus_diplo = micronsToFrams(20);
    102102        ExpParams.chamber_difference_diplo = 0.2;
    103103        max_chamber_energ = [Vector.new(), Vector.new()];
     
    125125
    126126        //nutrients
    127         ExpParams.nutrientsize = scale(10);
     127        ExpParams.nutrientsize = micronsToFrams(10);
    128128        ExpParams.energy_nut = 100 * Math.pow(ExpParams.nutrientsize, 3);
    129129        ExpParams.nutrientPop = 1;
     
    136136@include "standard_placement.inc"
    137137
    138 function scale(micrometers) //micrometers to framsticks world units
     138function micronsToFrams(micrometers)
    139139{
    140140        return micrometers*0.025;
    141141}
    142142
    143 function framsToMicrons(framsworldunits) //...and back ^^^
     143function framsToMicrons(framsworldunits)
    144144{
    145145        return framsworldunits/0.025;
Note: See TracChangeset for help on using the changeset viewer.