Changeset 528 for cpp/frams/genetics

Timestamp:

07/18/16 04:14:37 (8 years ago)

Author:

Maciej Komosinski

Message:

• Part.m removed
• Part.h becomes XPROP
• validate more part and joint properties in Model.internalcheck()

Location:

cpp/frams/genetics

Files:

• f1/conv_f1.cpp (modified) (1 diff)
• f4/conv_f4.cpp (modified) (2 diffs)

cpp/frams/genetics/f1/conv_f1.cpp

@@ -316 +316 @@
 int Builder::growPart(F1Props &c,const char *g)
 {
-sprintf(tmp,"p:m=1,dn=%lg,fr=%lg,ing=%lg,as=%lg,vs=%g,vr=%g,vg=%g,vb=%g",
+sprintf(tmp,"p:dn=%lg,fr=%lg,ing=%lg,as=%lg,vs=%g,vr=%g,vg=%g,vb=%g",
         1.0/c.masa,c.tarcie,c.wchl,c.asym, c.grub, c.cred,c.cgreen,c.cblue);
 return model.singleStepBuild(tmp,makeRange(g));

cpp/frams/genetics/f4/conv_f4.cpp

@@ -178 +178 @@
                         // new part object for firstend
                         // coordinates are left to be computed by Model
-                        sprintf(tmpLine, "p:m=1,fr=%g,ing=%g,as=%g",
+                        sprintf(tmpLine, "p:fr=%g,ing=%g,as=%g",
                                 /*1.0/C->P.mass,*/ C->P.friction, C->P.ingest, C->P.assim
                                 //C->firstend.x, C->firstend.y, C->firstend.z
@@ -194 +194 @@
                 }
                 // new part object for lastend
-                sprintf(tmpLine, "p:m=1,fr=%g,ing=%g,as=%g",
+                sprintf(tmpLine, "p:fr=%g,ing=%g,as=%g",
                         //C->lastend.x, C->lastend.y, C->lastend.z
                         /*"vol=" 1.0/C->P.mass,*/ C->P.friction, C->P.ingest, C->P.assim