Author: gegorbet Date: 2019-08-14 15:51:08 +0000 (Wed, 14 Aug 2019) New Revision: 2812 Modified: trunk/programs/us_density_match/us_density_match.cpp trunk/programs/us_density_match/us_model_params.cpp Log: density_match fix for floating percent valueand for use of smoothed s,D in other vector calcs Modified: trunk/programs/us_density_match/us_density_match.cpp =================================================================== --- trunk/programs/us_density_match/us_density_match.cpp 2019-08-14 14:48:40 UTC (rev 2811) +++ trunk/programs/us_density_match/us_density_match.cpp 2019-08-14 15:51:08 UTC (rev 2812) @@ -1329,8 +1329,10 @@ for ( int jj = 0; jj < npoints; jj++ ) { // *** Mi = si*R*T/(Di_avg*(1-vbari*rho)) - double sedco = alldis[ 0 ].bf_distro[ jj ].s * 1.0e-13; - double difco = alldis[ 0 ].bf_distro[ jj ].d * 1.0e-7; +// double sedco = alldis[ 0 ].bf_distro[ jj ].s * 1.0e-13; +// double difco = alldis[ 0 ].bf_distro[ jj ].d * 1.0e-7; + double sedco = v_sedcs[ 0 ][ jj ] * 1.0e-13; + double difco = v_difcs[ 0 ][ jj ] * 1.0e-7; double vbari = v_vbars[ jj ]; double mmass = sedco * R_GC * K20 / ( difco * ( 1.0 - vbari * DENS_20W ) ); mmass = qAbs( mmass ); @@ -1350,7 +1352,8 @@ // fi = RT/(N*Di) // *** fi/f_0i // *** ri = fi/(6 * pi * eta) <-- hydrodynamic radius - double difco = alldis[ 0 ].bf_distro[ jj ].d * 1.0e-7; +// double difco = alldis[ 0 ].bf_distro[ jj ].d * 1.0e-7; + double difco = v_difcs[ 0 ][ jj ] * 1.0e-7; double frico = R_GC * K20 / ( difco * AVOGADRO ); double hyrad = frico / ( 6.0 * M_PI * VISC_20W ); v_hrads << hyrad; @@ -1371,7 +1374,8 @@ // fi = RT/(N*Di) // *** fi/f_0i // *** ri = fi/(6 * pi * eta) <-- hydrodynamic radius - double difco = alldis[ 0 ].bf_distro[ jj ].d * 1.0e-7; +// double difco = alldis[ 0 ].bf_distro[ jj ].d * 1.0e-7; + double difco = v_difcs[ 0 ][ jj ] * 1.0e-7; double vbari = v_vbars[ jj ]; // double rzero = pow( ( ( 0.75 / M_PI ) * vbari ), a_third ); double volum = v_mmass[ jj ] * vbari / AVOGADRO; Modified: trunk/programs/us_density_match/us_model_params.cpp =================================================================== --- trunk/programs/us_density_match/us_model_params.cpp 2019-08-14 14:48:40 UTC (rev 2811) +++ trunk/programs/us_density_match/us_model_params.cpp 2019-08-14 15:51:08 UTC (rev 2812) @@ -268,14 +268,14 @@ { // Count D2O percent values given if ( !etext.isEmpty() ) { - int pctval = etext.toInt(); - if ( etext == "0" ) + double pctval = etext.toDouble(); + if ( etext == "0" || etext == "0.0" ) { // Zero percent: bump counts nzd2pc++; nad2pc++; DbgLv(1) << " vlf: pctval" << pctval << "nzd2pc nad2pc" << nzd2pc << nad2pc; } - else if ( pctval != 0 ) + else if ( pctval > 0.0 ) { // Non-zero numeric: bump percent count nad2pc++; DbgLv(1) << " vlf: pctval" << pctval << "nad2pc" << nad2pc; @@ -343,13 +343,13 @@ { if ( !etext.isEmpty() ) { - int pctval = etext.toInt(); - if ( etext == "0" ) + double pctval = etext.toDouble(); + if ( etext == "0" || etext == "0.0" ) { // Count 0 percent and total percent nzd2pc++; nad2pc++; } - else if ( pctval != 0 ) + else if ( pctval > 0.0 ) { // Count total non-empty percent values given nad2pc++; }