Changeset e161fac in sasview for sansmodels/src/sans/models


Ignore:
Timestamp:
Nov 30, 2011 2:30:43 PM (13 years ago)
Author:
Mathieu Doucet <doucetm@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
890ac7f1
Parents:
6a2c931
Message:

Re #5 fixing samsmodels compilation on MSVC

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/c_extensions/bcc.c

    r4628e31 re161fac  
    55#include "libSphere.h" 
    66#include <math.h> 
     7#include <stdio.h> 
    78 
    89 
     
    6768        double aa, Da, qDa_2, latticeScale, Zq, Fkq, Fkq_2; 
    6869 
    69         double dp[5]; 
     70  //convert angle degree to radian 
     71  double pi = 4.0*atan(1.0); 
     72  double theta = pars->theta * pi/180.0; 
     73  double phi = pars->phi * pi/180.0; 
     74  double psi = pars->psi * pi/180.0; 
     75 
     76  double dp[5]; 
    7077        dp[0] = 1.0; 
    7178        dp[1] = pars->radius; 
     
    7380        dp[3] = pars->sldSolv; 
    7481        dp[4] = 0.0; 
    75  
    76         //convert angle degree to radian 
    77         double pi = 4.0*atan(1.0); 
    78         double theta = pars->theta * pi/180.0; 
    79         double phi = pars->phi * pi/180.0; 
    80         double psi = pars->psi * pi/180.0; 
    8182 
    8283        aa = pars->dnn; 
Note: See TracChangeset for help on using the changeset viewer.