Attachment #168552 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch

Lines 258-269 Link Here

(-)src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx (-2 / +39 lines)
258	}	258	}
259		259
260	#ifdef HDF_NEW_API	260	#ifdef HDF_NEW_API
		261
		262	#if H5_VERS_RELEASE < 7
261	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	263	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
262	return -1;	264	return -1;
263		265
264	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)	266	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
265	return -1;	267	return -1;
266	#else	268	#else
		269	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		270	return -1;
		271
		272	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
		273	return -1;
		274	#endif
		275
		276	#else
267	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)	277	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
268	return -1;	278	return -1;
269		279
Lines 291-303 Link Here
291	}	301	}
292	}	302	}
293		303
294	#ifdef HDF_NEW_API	304	#ifdef HDF_NEW_API
		305
		306	#if H5_VERS_RELEASE < 7
295	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	307	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
296	return -1;	308	return -1;
297		309
298	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)	310	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
299	return -1;	311	return -1;
300	#else	312	#else
		313	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		314	return -1;
		315
		316	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
		317	return -1;
		318	#endif
		319
		320	#else
301	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)	321	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
302	return -1;	322	return -1;
303		323
Lines 378-386 Link Here
378	}	398	}
379		399
380	#ifdef HDF_NEW_API	400	#ifdef HDF_NEW_API
		401
		402	#if H5_VERS_RELEASE < 7
381	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)	403	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
382	return -1;	404	return -1;
383	#else	405	#else
		406	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
		407	return -1;
		408	#endif
		409
		410	#else
384	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)	411	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)
385	return -1;	412	return -1;
386	#endif	413	#endif
Lines 418-428 Link Here
418	}	445	}
419		446
420	#ifdef HDF_NEW_API	447	#ifdef HDF_NEW_API
		448
		449	#if H5_VERS_RELEASE < 7
421	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	450	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
422	return -1;	451	return -1;
423		452
424	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)	453	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
425	return -1;	454	return -1;
		455	#else
		456	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		457	return -1;
		458
		459	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
		460	return -1;
		461	#endif
		462
426	#else	463	#else
427	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)	464	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
428	return -1;	465	return -1;




	  { /* switch pflmod pout FULL_INTERLACE*/
	  case MED_GLOBALE :

		    /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */
		    if ( (memspace = H5Screate_simple (1, size, NULL)) <0)
		      return -1;

		    for (dim=firstdim; dim < lastdim; dim++) {
		      
		      for (i=0; i < psize; i++)              /* i balaye les élements du profil */
			for (j=0; j < ngauss; j++) {         
			  index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
			  pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim;
			  pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j;	     
			}
		    }
		     
	#ifdef HDF_NEW_API

#if H5_VERS_RELEASE < 7
	      
	      for (i=0; i < psize; i++)              /* i balaye les élements du profil */
		for (j=0; j < ngauss; j++) {         
		  index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
		  pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim;
		  pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j;	     
		}
	    }
	     
#ifdef HDF_NEW_API
	    if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) 
	      return -1; 
	      
	    if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) 
	      return -1; 
#else
	    if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
	      return -1;

	    if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) 
	    return -1;
#endif

#else
	    if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) 
	      return -1; 
	      

	    }
	    
#ifdef HDF_NEW_API

#if H5_VERS_RELEASE < 7
	    if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) 
	      return -1; 
	    
	    if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) 
	      return -1; 
#else
	    if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) 
	      return -1; 
	    
	    if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) 
	      return -1; 
#endif

#else
	    if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) 
	      return -1; 
	    

	pfldsk     = (med_size *) malloc(sizeof(med_size)*pcount[0]);
#else
	pfldsk     = (med_ssize *) malloc(sizeof(med_ssize)*pcount[0]);
	#endif

		switch(pflmod)
		  { /*switch plfmod pour NO_INTERLACE */
		  case MED_GLOBALE :
		    
		    for (dim=firstdim; dim < lastdim; dim++) {
		      
		      for (i=0; i < psize; i++)              /* i balaye le nbre d'élements du profil                */
			for (j=0; j < ngauss; j++) { 
			  index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
			  pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j;	    
			}
		    }
		    
#ifdef HDF_NEW_API

#if H5_VERS_RELEASE < 7
	    if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) 
	      return -1;
#else
	    if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) 
	      return -1;
#endif

#else
	    if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0) 
	      return -1;
#endif
		    
	    if ((ret = H5Dwrite(dataset,type_hdf,dataspace,dataspace,H5P_DEFAULT, val)) < 0)
	      return -1;
		    
	    break;
		    
	  case MED_COMPACT :
		    
		    /* Creation d'un data space mémoire de dimension 1, de la longeur du profil          */
		    /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose       */
		    /*  que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */ 

	    if ( (memspace = H5Screate_simple (1, pflsize, NULL)) <0)
	      return -1;

#else
	    pflmem     = (med_ssize *) malloc (sizeof(med_ssize)*pcount[0]);
#endif
		    
	    /* Le profil COMPACT est contigüe, mais il est possible que l'on selectionne uniquemenent une dimension*/
		    
	    for (dim=firstdim; dim < lastdim; dim++) {
		      
	      for (i=0; i < psize; i++)              /* i balaye le nbre d'élements du profil                */
		for (j=0; j < ngauss; j++) {
		  index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
		  pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j;
		  pfldsk[index] = dim*count[0]  + (pfltab[i]-1)*ngauss+j;	    
		}
	    }
		     
#ifdef HDF_NEW_API

#if H5_VERS_RELEASE < 7
	    if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t **) pflmem ) ) <0) 
	      return -1; 
	      
	    if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) 
	      return -1;
#else
	    if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t *) pflmem ) ) <0) 
	      return -1; 
	      
	    if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) 
	      return -1;
#endif

#else
	    if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hssize_t **) pflmem ) ) <0) 
	      return -1; 
	      

Lines 204-215 Link Here

(-)src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx (-1 / +38 lines)
204	}	204	}
205		205
206	#ifdef HDF_NEW_API	206	#ifdef HDF_NEW_API
		207
		208	#if H5_VERS_RELEASE < 7
207	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	209	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
208	return -1;	210	return -1;
209		211
210	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)	212	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
211	return -1;	213	return -1;
212	#else	214	#else
		215	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		216	return -1;
		217
		218	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
		219	return -1;
		220	#endif
		221
		222	#else
213	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)	223	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
214	return -1;	224	return -1;
215		225
Lines 239-249 Link Here
239	}	249	}
240		250
241	#ifdef HDF_NEW_API	251	#ifdef HDF_NEW_API
		252
		253	#if H5_VERS_RELEASE < 7
242	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	254	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
243	return -1;	255	return -1;
244		256
245	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)	257	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
		258	return -1;
		259	#else
		260	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
246	return -1;	261	return -1;
		262
		263	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
		264	return -1;
		265	#endif
		266
247	#else	267	#else
248	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)	268	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
249	return -1;	269	return -1;
Lines 325-333 Link Here
325	}	345	}
326		346
327	#ifdef HDF_NEW_API	347	#ifdef HDF_NEW_API
		348
		349	#if H5_VERS_RELEASE < 7
328	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)	350	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
329	return -1;	351	return -1;
330	#else	352	#else
		353	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
		354	return -1;
		355	#endif
		356
		357	#else
331	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)	358	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)
332	return -1;	359	return -1;
333	#endif	360	#endif
Lines 369-379 Link Here
369	}	396	}
370		397
371	#ifdef HDF_NEW_API	398	#ifdef HDF_NEW_API
		399
		400	#if H5_VERS_RELEASE < 7
372	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	401	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
373	return -1;	402	return -1;
374		403
375	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)	404	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
376	return -1;	405	return -1;
		406	#else
		407	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		408	return -1;
		409
		410	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
		411	return -1;
		412	#endif
		413
377	#else	414	#else
378	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)	415	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
379	return -1;	416	return -1;

Return to bug 155974

Lines 205-231 Link Here

(-)src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx (-40 / +77 lines)
205	{ /* switch pflmod pout FULL_INTERLACE*/	205	{ /* switch pflmod pout FULL_INTERLACE*/
206	case MED_GLOBALE :	206	case MED_GLOBALE :
207		207
208	/* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */	208	/* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */
209	if ( (memspace = H5Screate_simple (1, size, NULL)) <0)	209	if ( (memspace = H5Screate_simple (1, size, NULL)) <0)
210	return -1;	210	return -1;
		211
		212	for (dim=firstdim; dim < lastdim; dim++) {
		213
		214	for (i=0; i < psize; i++) /* i balaye les élements du profil */
		215	for (j=0; j < ngauss; j++) {
		216	index = ingauss+j + (dim-firstdim)(psize*ngauss);
		217	pflmem[index] = (pfltab[i]-1)ngaussnbdim + j*nbdim+dim;
		218	pfldsk[index] = dimcount[0] + (pfltab[i]-1)ngauss+j;
		219	}
		220	}
		221
		222	#ifdef HDF_NEW_API
211		223
212	for (dim=firstdim; dim < lastdim; dim++) {	224	#if H5_VERS_RELEASE < 7
213
214	for (i=0; i < psize; i++) /* i balaye les élements du profil */
215	for (j=0; j < ngauss; j++) {
216	index = ingauss+j + (dim-firstdim)(psize*ngauss);
217	pflmem[index] = (pfltab[i]-1)ngaussnbdim + j*nbdim+dim;
218	pfldsk[index] = dimcount[0] + (pfltab[i]-1)ngauss+j;
219	}
220	}
221
222	#ifdef HDF_NEW_API
223	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	225	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
224	return -1;	226	return -1;
225		227
226	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)	228	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
227	return -1;	229	return -1;
228	#else	230	#else
		231	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		232	return -1;
		233
		234	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
		235	return -1;
		236	#endif
		237
		238	#else
229	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)	239	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
230	return -1;	240	return -1;
231		241
Lines 255-266 Link Here
255	}	265	}
256		266
257	#ifdef HDF_NEW_API	267	#ifdef HDF_NEW_API
		268
		269	#if H5_VERS_RELEASE < 7
258	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	270	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
259	return -1;	271	return -1;
260		272
261	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)	273	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
262	return -1;	274	return -1;
263	#else	275	#else
		276	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		277	return -1;
		278
		279	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
		280	return -1;
		281	#endif
		282
		283	#else
264	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)	284	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
265	return -1;	285	return -1;
266		286
Lines 326-364 Link Here
326	pfldsk = (med_size ) malloc(sizeof(med_size)pcount[0]);	346	pfldsk = (med_size ) malloc(sizeof(med_size)pcount[0]);
327	#else	347	#else
328	pfldsk = (med_ssize ) malloc(sizeof(med_ssize)pcount[0]);	348	pfldsk = (med_ssize ) malloc(sizeof(med_ssize)pcount[0]);
329	#endif	349	#endif
330		350
331	switch(pflmod)	351	switch(pflmod)
332	{ /switch plfmod pour NO_INTERLACE /	352	{ /switch plfmod pour NO_INTERLACE /
333	case MED_GLOBALE :	353	case MED_GLOBALE :
334		354
335	for (dim=firstdim; dim < lastdim; dim++) {	355	for (dim=firstdim; dim < lastdim; dim++) {
336		356
337	for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */	357	for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */
338	for (j=0; j < ngauss; j++) {	358	for (j=0; j < ngauss; j++) {
339	index = ingauss+j + (dim-firstdim)(psize*ngauss);	359	index = ingauss+j + (dim-firstdim)(psize*ngauss);
340	pfldsk[index] = dimcount[0]+(pfltab[i]-1)ngauss+j;	360	pfldsk[index] = dimcount[0]+(pfltab[i]-1)ngauss+j;
341	}	361	}
342	}	362	}
343		363
344	#ifdef HDF_NEW_API	364	#ifdef HDF_NEW_API
		365
		366	#if H5_VERS_RELEASE < 7
345	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)	367	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
346	return -1;	368	return -1;
347	#else	369	#else
		370	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
		371	return -1;
		372	#endif
		373
		374	#else
348	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)	375	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)
349	return -1;	376	return -1;
350	#endif	377	#endif
351		378
352	if ((ret = H5Dwrite(dataset,type_hdf,dataspace,dataspace,H5P_DEFAULT, val)) < 0)	379	if ((ret = H5Dwrite(dataset,type_hdf,dataspace,dataspace,H5P_DEFAULT, val)) < 0)
353	return -1;	380	return -1;
354		381
355	break;	382	break;
356		383
357	case MED_COMPACT :	384	case MED_COMPACT :
358		385
359	/* Creation d'un data space mémoire de dimension 1, de la longeur du profil */	386	/* Creation d'un data space mémoire de dimension 1, de la longeur du profil */
360	/* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */	387	/* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */
361	/* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */	388	/* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */
362		389
363	if ( (memspace = H5Screate_simple (1, pflsize, NULL)) <0)	390	if ( (memspace = H5Screate_simple (1, pflsize, NULL)) <0)
364	return -1;	391	return -1;
Lines 368-393 Link Here
368	#else	395	#else
369	pflmem = (med_ssize ) malloc (sizeof(med_ssize)pcount[0]);	396	pflmem = (med_ssize ) malloc (sizeof(med_ssize)pcount[0]);
370	#endif	397	#endif
371		398
372	/* Le profil COMPACT est contigüe, mais il est possible que l'on selectionne uniquemenent une dimension*/	399	/* Le profil COMPACT est contigüe, mais il est possible que l'on selectionne uniquemenent une dimension*/
373		400
374	for (dim=firstdim; dim < lastdim; dim++) {	401	for (dim=firstdim; dim < lastdim; dim++) {
375		402
376	for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */	403	for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */
377	for (j=0; j < ngauss; j++) {	404	for (j=0; j < ngauss; j++) {
378	index = ingauss+j + (dim-firstdim)(psize*ngauss);	405	index = ingauss+j + (dim-firstdim)(psize*ngauss);
379	pflmem[index] = dim(psizengauss) + (pfltab[i]-1)*ngauss+j;	406	pflmem[index] = dim(psizengauss) + (pfltab[i]-1)*ngauss+j;
380	pfldsk[index] = dimcount[0] + (pfltab[i]-1)ngauss+j;	407	pfldsk[index] = dimcount[0] + (pfltab[i]-1)ngauss+j;
381	}	408	}
382	}	409	}
383		410
384	#ifdef HDF_NEW_API	411	#ifdef HDF_NEW_API
		412
		413	#if H5_VERS_RELEASE < 7
385	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t **) pflmem ) ) <0)	414	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t **) pflmem ) ) <0)
386	return -1;	415	return -1;
387		416
388	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)	417	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
389	return -1;	418	return -1;
390	#else	419	#else
		420	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t *) pflmem ) ) <0)
		421	return -1;
		422
		423	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
		424	return -1;
		425	#endif
		426
		427	#else
391	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hssize_t **) pflmem ) ) <0)	428	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hssize_t **) pflmem ) ) <0)
392	return -1;	429	return -1;
393		430