Changeset 13758
- Timestamp:
- 10/19/12 17:27:45 (12 years ago)
- Location:
- issm/trunk-jpl/src/c/shared
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/shared/Elements/Paterson.cpp
r13622 r13758 60 60 B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.003748937622487*pow(T+5,3)+0.015290593619213*pow(T+5,2) -0.048160403003748*(T+5)+ 0.854987973338348); 61 61 } 62 else if(T>=-2.0){62 else{ 63 63 B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.003748937622488*pow(T+2,3)-0.018449844983174*pow(T+2,2) -0.057638157095631*(T+2)+ 0.746900791092860); 64 64 } -
issm/trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp
r13622 r13758 10 10 IssmDouble B; // surface mass balance, melt+accumulation 11 11 12 int iqj,imonth , j;12 int iqj,imonth; 13 13 14 14 IssmDouble saccu; // yearly surface accumulation … … 20 20 IssmDouble sconv; //rhow_rain/rhoi / 12 months 21 21 22 IssmDouble density;23 22 IssmDouble lapser=6.5/1000., sealev=0.; // lapse rate. degrees per meter. 7.5 lev's 99 paper, 9 Marshall 99 paper 24 23 IssmDouble desfac = 0.5; // desert elevation factor -
issm/trunk-jpl/src/c/shared/Elements/TransformLoadVectorCoord.cpp
r13056 r13758 20 20 void TransformLoadVectorCoord(ElementVector* pe,Node** nodes,int numnodes,int* cs_array){ 21 21 22 int i ,j;22 int i; 23 23 int numdofs = 0; 24 24 IssmDouble *transform = NULL; -
issm/trunk-jpl/src/c/shared/Elements/TransformSolutionCoord.cpp
r13056 r13758 21 21 void TransformSolutionCoord(IssmDouble* solution,Node** nodes,int numnodes,int* cs_array){ 22 22 23 int i ,j;23 int i; 24 24 int numdofs = 0; 25 25 IssmDouble *transform = NULL; -
issm/trunk-jpl/src/c/shared/Exceptions/exprintf.cpp
r13622 r13758 16 16 char *buffer = NULL; 17 17 int n,size = 100; 18 int string_size;19 18 20 19 //variable list of arguments -
issm/trunk-jpl/src/c/shared/Exp/IsInPolySerial.cpp
r13622 r13758 9 9 int IsInPolySerial(double* in,double* xc,double* yc,int numvertices,double* x,double* y,int nods, int edgevalue){ 10 10 11 int i,j;12 11 double x0,y0; 13 12 14 13 /*Go through all vertices of the mesh:*/ 15 for (i=0;i<nods;i++){14 for(int i=0;i<nods;i++){ 16 15 if (in[i]){ 17 16 /*this vertex already is inside one of the contours, continue*/ -
issm/trunk-jpl/src/c/shared/Exp/exp.h
r13623 r13758 90 90 nprof=1; 91 91 for(;;){ 92 fscanf(fid,"%25 6s %256s\n",chardummy,chardummy);93 fscanf(fid,"%25 6s %256s\n",chardummy,chardummy);94 fscanf(fid,"%25 6s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy);95 fscanf(fid,"%20u %25 6s\n",&n,chardummy);96 fscanf(fid,"%25 6s %256s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy,chardummy);92 fscanf(fid,"%255s %255s\n",chardummy,chardummy); 93 fscanf(fid,"%255s %255s\n",chardummy,chardummy); 94 fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy); 95 fscanf(fid,"%20u %255s\n",&n,chardummy); 96 fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy); 97 97 for (i=0;i<n;i++) fscanf(fid,"%20lf %20lf\n",&ddummy,&ddummy); 98 98 /*check whether we are at the end of the file, otherwise, keep reading next profile:*/ … … 118 118 119 119 /*Skip header: */ 120 fscanf(fid,"%25 6s %256s\n",chardummy,chardummy);121 fscanf(fid,"%25 6s %256s\n",chardummy,chardummy);122 fscanf(fid,"%25 6s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy);120 fscanf(fid,"%255s %255s\n",chardummy,chardummy); 121 fscanf(fid,"%255s %255s\n",chardummy,chardummy); 122 fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy); 123 123 124 124 /*Get number of profile vertices: */ 125 fscanf(fid,"%20u %25 6s\n",&n,chardummy);125 fscanf(fid,"%20u %255s\n",&n,chardummy); 126 126 127 127 /*Skip next line: */ 128 fscanf(fid,"%25 6s %256s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy,chardummy);128 fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy); 129 129 130 130 /*Allocate vertices: */ -
issm/trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp
r12529 r13758 7 7 void XZvectorsToCoordinateSystem(IssmDouble* T,IssmDouble* xzvectors){ 8 8 9 int i,j;10 9 IssmDouble x[3],y[3],z[3]; 11 10 IssmDouble x_norm, y_norm, z_norm; 12 11 13 for(i =0;i<6;i++){12 for(int i=0;i<6;i++){ 14 13 if(xIsNan<IssmDouble>(xzvectors[i])){ 15 14 /*At least one NaN found: default to Id*/
Note:
See TracChangeset
for help on using the changeset viewer.