Changeset 13697


Ignore:
Timestamp:
10/16/12 11:26:29 (12 years ago)
Author:
jschierm
Message:

FIX: Remove unallocated array.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/python/io/WritePythonData.cpp

    r13695 r13697  
    141141        int i;
    142142        PyObject* list=NULL;
    143         PyObject** dict=NULL;
    144 
     143        PyObject* dict=NULL;
     144
     145        _printf_(1,"point 0\n");
    145146        list=PyList_New((Py_ssize_t)0);
     147        _printf_(1,"point 1\n");
    146148
    147149        for (i=0; i<riftstruct->numrifts; i++) {
    148                 dict[i]=PyDict_New();
    149 
    150                 PyDict_SetItemString(dict[i],"numsegs"          ,PyInt_FromSsize_t((Py_ssize_t)riftstruct->riftsnumsegments[i]));
    151                 PyDict_SetItemString(dict[i],"segments"         ,PyArrayFromCopiedData(riftstruct->riftsnumsegments[i]    ,3,riftstruct->riftssegments[i]));
    152                 PyDict_SetItemString(dict[i],"pairs"            ,PyArrayFromCopiedData(riftstruct->riftsnumpairs[i]       ,2,riftstruct->riftspairs[i]));
    153                 PyDict_SetItemString(dict[i],"tips"             ,PyArrayFromCopiedData(1                                  ,2,&riftstruct->riftstips[2*i]));
    154                 PyDict_SetItemString(dict[i],"penaltypairs"     ,PyArrayFromCopiedData(riftstruct->riftsnumpenaltypairs[i],7,riftstruct->riftspenaltypairs[i]));
    155                 PyDict_SetItemString(dict[i],"fill"             ,PyInt_FromSsize_t((Py_ssize_t)IceEnum));
    156                 PyDict_SetItemString(dict[i],"friction"         ,PyInt_FromSsize_t((Py_ssize_t)0));
    157                 PyDict_SetItemString(dict[i],"fraction"         ,PyFloat_FromDouble(0.));
    158                 PyDict_SetItemString(dict[i],"fractionincrement",PyFloat_FromDouble(0.1));
    159                 PyDict_SetItemString(dict[i],"state"            ,PyArrayFromCopiedData(riftstruct->riftsnumpenaltypairs[i],1,riftstruct->state[i]));
    160 
    161                 PyList_Append(list, dict[i]);
     150                _printf_(1,"point 2\n");
     151                dict=PyDict_New();
     152                _printf_(1,"point 2a\n");
     153
     154                PyDict_SetItemString(dict,"numsegs"          ,PyInt_FromSsize_t((Py_ssize_t)riftstruct->riftsnumsegments[i]));
     155                _printf_(1,"point 2b\n");
     156                PyDict_SetItemString(dict,"segments"         ,PyArrayFromCopiedData(riftstruct->riftsnumsegments[i]    ,3,riftstruct->riftssegments[i]));
     157                _printf_(1,"point 2c\n");
     158                PyDict_SetItemString(dict,"pairs"            ,PyArrayFromCopiedData(riftstruct->riftsnumpairs[i]       ,2,riftstruct->riftspairs[i]));
     159                _printf_(1,"point 2d\n");
     160                PyDict_SetItemString(dict,"tips"             ,PyArrayFromCopiedData(1                                  ,2,&riftstruct->riftstips[2*i]));
     161                _printf_(1,"point 2e\n");
     162                PyDict_SetItemString(dict,"penaltypairs"     ,PyArrayFromCopiedData(riftstruct->riftsnumpenaltypairs[i],7,riftstruct->riftspenaltypairs[i]));
     163                _printf_(1,"point 2f\n");
     164                PyDict_SetItemString(dict,"fill"             ,PyInt_FromSsize_t((Py_ssize_t)IceEnum));
     165                _printf_(1,"point 2g\n");
     166                PyDict_SetItemString(dict,"friction"         ,PyInt_FromSsize_t((Py_ssize_t)0));
     167                _printf_(1,"point 2h\n");
     168                PyDict_SetItemString(dict,"fraction"         ,PyFloat_FromDouble(0.));
     169                _printf_(1,"point 2i\n");
     170                PyDict_SetItemString(dict,"fractionincrement",PyFloat_FromDouble(0.1));
     171                _printf_(1,"point 2j\n");
     172                PyDict_SetItemString(dict,"state"            ,PyArrayFromCopiedData(riftstruct->riftsnumpenaltypairs[i],1,riftstruct->state[i]));
     173                _printf_(1,"point 2k\n");
     174
     175                PyList_Append(list, dict);
     176                _printf_(1,"point 3\n");
    162177        }
     178        _printf_(1,"point 4\n");
    163179
    164180        PyTuple_SetItem(py_tuple, index, list);
     181        _printf_(1,"point 5\n");
    165182}
    166183/*}}}*/
Note: See TracChangeset for help on using the changeset viewer.