From: Frederic D. <de...@us...> - 2004-04-27 16:01:03
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31543/src/org/fudaa/dodico/fichiers Modified Files: MaillageCORELEBTH.java Log Message: Modif DObjets Index: MaillageCORELEBTH.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/MaillageCORELEBTH.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MaillageCORELEBTH.java 25 Nov 2003 10:11:34 -0000 1.7 --- MaillageCORELEBTH.java 27 Apr 2004 16:00:43 -0000 1.8 *************** *** 18,21 **** --- 18,24 ---- import java.util.Iterator; import java.util.List; + + import org.fudaa.dodico.boony.BoonyLib; + import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.ef.IElement; import org.fudaa.dodico.corba.ef.IMaillage; *************** *** 23,31 **** import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.corba.geometrie.LTypeElement; - import org.fudaa.dodico.corba.usine.IUsine; import org.fudaa.dodico.fortran.FortranReader; import org.fudaa.dodico.fortran.FortranWriter; import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.usine.UsineHelper; /** * Filtre sur les fichiers maillage .cor/.ele/.bth (format Preflux) --- 26,32 ---- *************** *** 75,79 **** System.err.println("### Lecture " + racine + eleExt); elements= lireFichierELE(racine + eleExt, noeuds); ! IMaillage res= UsineHelper.findUsine().creeEfMaillage(); res.elements(elements); return res; --- 76,80 ---- System.err.println("### Lecture " + racine + eleExt); elements= lireFichierELE(racine + eleExt, noeuds); ! IMaillage res= BoonyLib.findUsine().creeEfMaillage(); res.elements(elements); return res; *************** *** 231,235 **** // Coordonnées <x>,<y> fmt= new int[] { formatCol1, 10, 10 }; ! IUsine usine= UsineHelper.findUsine(); for (int i= 0; i < nbNoeuds; i++) { file.readFields(fmt); --- 232,236 ---- // Coordonnées <x>,<y> fmt= new int[] { formatCol1, 10, 10 }; ! IUsine usine= BoonyLib.findUsine(); for (int i= 0; i < nbNoeuds; i++) { file.readFields(fmt); |