Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Frederic D. <de...@us...> - 2004-06-11 16:34:35
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/dico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1333/src/org/fudaa/dodico/telemac/dico Modified Files: DicoSubief2dv5p4.java DicoTomawacv5p4.java Log Message: Maj Index: DicoTomawacv5p4.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/dico/DicoTomawacv5p4.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DicoTomawacv5p4.java 1 Jun 2004 11:23:24 -0000 1.1 --- DicoTomawacv5p4.java 11 Jun 2004 16:34:24 -0000 1.2 *************** *** 4027,4030 **** --- 4027,4031 ---- //start FICHIER DE GEOMETRIE typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER DE GEOMETRIE"; *************** *** 4051,4054 **** --- 4052,4056 ---- //start FICHIER FORTRAN typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER FORTRAN"; *************** *** 4070,4073 **** --- 4072,4076 ---- //start FICHIER DES PARAMETRES typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER DES PARAMETRES"; *************** *** 4090,4093 **** --- 4093,4097 ---- //start FICHIER DES CONDITIONS AUX LIMITES typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER DES CONDITIONS AUX LIMITES"; *************** *** 4114,4117 **** --- 4118,4122 ---- //start FICHIER DES FONDS typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER DES FONDS"; *************** *** 4135,4138 **** --- 4140,4144 ---- //start FICHIER DES RESULTATS 2D typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER DES RESULTATS 2D"; *************** *** 4166,4169 **** --- 4172,4176 ---- //start FICHIER DES RESULTATS PONCTUELS typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER DES RESULTATS PONCTUELS"; *************** *** 4199,4202 **** --- 4206,4210 ---- //start FICHIER DU CALCUL PRECEDENT typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER DU CALCUL PRECEDENT"; *************** *** 4223,4226 **** --- 4231,4235 ---- //start FICHIER DES RESULTATS GLOBAUX typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER DES RESULTATS GLOBAUX"; *************** *** 4246,4249 **** --- 4255,4259 ---- //start FICHIER DES COURANTS BINAIRE typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER DES COURANTS BINAIRE"; *************** *** 4272,4275 **** --- 4282,4286 ---- //start FICHIER DES COURANTS FORMATE typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER DES COURANTS FORMATE"; *************** *** 4298,4301 **** --- 4309,4313 ---- //start FICHIER BINAIRE 1 typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER BINAIRE 1"; *************** *** 4315,4318 **** --- 4327,4331 ---- //start FICHIER FORMATE 1 typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER FORMATE 1"; Index: DicoSubief2dv5p4.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/dico/DicoSubief2dv5p4.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DicoSubief2dv5p4.java 1 Jun 2004 11:23:24 -0000 1.1 --- DicoSubief2dv5p4.java 11 Jun 2004 16:34:24 -0000 1.2 *************** *** 491,494 **** --- 491,495 ---- //start DICTIONNAIRE DES PARAMETRES DE QE typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="DICTIONNAIRE DES PARAMETRES DE QE"; *************** *** 501,504 **** --- 502,506 ---- //start FICHIER FORTRAN DE LECTURE DES DONNEES typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER FORTRAN DE LECTURE DES DONNEES"; *************** *** 511,514 **** --- 513,517 ---- //start FICHIER FORTRAN DE CHIMIE typeChaine=new DicoDataType.Chaine(); + typeChaine.setFileType(true); valueByLanguage[0]="FICHIER FORTRAN DE CHIMIE"; |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:34:35
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1333/src/org/fudaa/dodico/test/h2d Modified Files: TestJMaillage.java Log Message: Maj Index: TestJMaillage.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d/TestJMaillage.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestJMaillage.java 31 Mar 2004 08:14:34 -0000 1.2 --- TestJMaillage.java 11 Jun 2004 16:34:25 -0000 1.3 *************** *** 27,31 **** import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.ef.EfNode; ! import org.fudaa.dodico.ef.EfdSegment; import org.fudaa.dodico.interpolateur.Interpolateur; import org.fudaa.dodico.interpolateur.InterpolationNearestNeighborRef; --- 27,31 ---- import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.ef.EfNode; ! import org.fudaa.dodico.ef.EfSegmentMutable; import org.fudaa.dodico.interpolateur.Interpolateur; import org.fudaa.dodico.interpolateur.InterpolationNearestNeighborRef; *************** *** 389,393 **** initMaillageT6(); assertTrue(temp.isEquivalent(mail_, true, eps_)); ! EfdSegment s= new EfdSegment(0, 1); assertEquals(11, segmentPtIdx.get(s)); s.setPt1Idx(1); --- 389,393 ---- initMaillageT6(); assertTrue(temp.isEquivalent(mail_, true, eps_)); ! EfSegmentMutable s= new EfSegmentMutable(0, 1); assertEquals(11, segmentPtIdx.get(s)); s.setPt1Idx(1); |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:34:32
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1333/src/org/fudaa/dodico/test/telemac Modified Files: TestJMatisse.java Added Files: BATHYGEO Log Message: Maj Index: TestJMatisse.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestJMatisse.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestJMatisse.java 2 Apr 2004 13:54:09 -0000 1.1 --- TestJMatisse.java 11 Jun 2004 16:34:23 -0000 1.2 *************** *** 12,22 **** import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.mnt.MNT; import org.fudaa.dodico.mnt.MNTPolygone; import org.fudaa.dodico.mnt.MNTZone; import org.fudaa.dodico.telemac.io.MatisseReader; import org.fudaa.dodico.test.TestIO; - /** * @author Fred Deniger --- 12,23 ---- import org.fudaa.dodico.fichiers.FileOperationSynthese; + import org.fudaa.dodico.fortran.FortranBinaryInputStream; import org.fudaa.dodico.mnt.MNT; import org.fudaa.dodico.mnt.MNTPolygone; + import org.fudaa.dodico.mnt.MNTPolyligne; import org.fudaa.dodico.mnt.MNTZone; import org.fudaa.dodico.telemac.io.MatisseReader; import org.fudaa.dodico.test.TestIO; /** * @author Fred Deniger *************** *** 31,50 **** super("Bathygeo01.mat"); } - - - public void testReader(){ - File f=fic_; - MatisseReader r=new MatisseReader(null); - r.setFile(f); - FileOperationSynthese s=r.read(); - if(s.containsMessages()) s.getAnalyze().printResume("Message: "); - MNT mnt=(MNT)s.getSource(); - System.out.println(mnt.nbZones()); - MNTZone z1=mnt.zone(0); - System.out.println(z1.getNbPolygones()); - MNTPolygone poly=z1.getPolygone(0); - System.out.println(poly.getNbPoints()); } ! } --- 32,57 ---- super("Bathygeo01.mat"); } + public void testReader(){ + File f=fic_; + MatisseReader r=new MatisseReader(null); + r.setFile(f); + System.out.println("Bathygeo1.mat"); + FileOperationSynthese s=r.read(); + if(s.containsMessages()) s.getAnalyze().printResume("Message: "); + MNT mnt=(MNT)s.getSource(); + MNTZone z1=mnt.zone(0); + MNTPolygone poly=z1.getPolygone(0); + } + + public void testReaderBug() { + File f = getFile("BATHYGEO"); + MatisseReader r = new MatisseReader(null); + r.setFile(f); + r.setMachineId(FortranBinaryInputStream.SPARC); + System.out.println("BATHYGEO"); + FileOperationSynthese s = r.read(); + if (s.containsMessages()) s.getAnalyze().printResume("Message: "); } ! } \ No newline at end of file --- NEW FILE: BATHYGEO --- (This appears to be a binary file; contents omitted.) |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:33:29
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/olb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv778/src/org/fudaa/dodico/olb Modified Files: OLBExec.java Log Message: Maj Index: OLBExec.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/olb/OLBExec.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OLBExec.java 12 Feb 2004 15:32:46 -0000 1.3 --- OLBExec.java 11 Jun 2004 16:33:13 -0000 1.4 *************** *** 12,15 **** --- 12,16 ---- import java.io.IOException; + import org.fudaa.dodico.commun.DodicoPreferences; import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.commun.DodicoUI; *************** *** 28,32 **** --- 29,35 ---- */ public class OLBExec { + boolean stop_; + /** * *************** *** 36,109 **** } public void stop() { ! stop_= true; } ! public EfGrid computeGrid( ! EfGrid _init, ! ProgressionInterface _prog, ! DodicoUI _ui) { ! stop_= false; ! File dir= new File("serveurs/olb"); ! if((_ui!=null) && (!dir.exists())) { ! ! _ui.error( ! "OLB", ! DodicoResource.getS( ! "Le dossier {0} du serveur est introuvable", ! dir.getAbsolutePath())); return null; } File inFile; File outFile; try { ! inFile= File.createTempFile("temp", ".olb_in", dir); ! outFile= File.createTempFile("temp", ".olb_out", dir); ! } catch (IOException e) { ! return null; } ! if (stop_) ! return null; ! if ((inFile == null) || (outFile == null)) return null; ! DunesAdapter interfaceDunes= new DunesAdapter(); interfaceDunes.setMaillage(_init); ! FileOperationSynthese op= ! DunesFileFormat.getInstance().getLastVersionImpl().write( ! inFile, ! interfaceDunes, ! _prog); ! if (stop_) ! return null; ! if ((_ui!=null) && (op.containsFatalError())) { _ui.error(op.getAnalyze().getFatalError().toString()); return null; } ! String exe; ! String os= System.getProperty("os.name"); ! if (os.startsWith("Windows")) ! exe= "olb.exe"; ! else ! exe= "olb-" + os + ".x"; ! String[] cmd= new String[3]; ! cmd[0]= new File(dir,exe).getAbsolutePath(); ! cmd[1]= inFile.getName(); ! cmd[2]= outFile.getName(); ! CExec exec=new CExec(cmd); exec.setExecDirectory(dir); exec.exec(); ! if(!outFile.exists()){ ! return null; ! } ! op=DunesFileFormat.getInstance().getLastVersionImpl().read(outFile, _prog); ! if((_ui!=null) && (op.containsFatalError())){ _ui.error("OLB", op.getAnalyze().getFatalError().getMessage()); } ! if(inFile!=null) inFile.delete(); ! if(outFile!=null) outFile.delete(); ! DunesInterface r=(DunesInterface)op.getSource(); ! if(r!=null) return r.getGrid(); return null; } ! } --- 39,125 ---- } + public static String getOlbExecDir() { + return DodicoPreferences.DODICO.getStringProperty("olb.exec.dir", new File("serveurs/olb/") + .getAbsolutePath()); + } + + public static void setOlbExecDir(String path) { + DodicoPreferences.DODICO.putStringProperty("olb.exec.dir", path); + } + + public static void unsetOlbExecDir() { + DodicoPreferences.DODICO.removeProperty("olb.exec.dir"); + } + + public static String getOlbName(){ + String os = System.getProperty("os.name"); + if (os.startsWith("Windows")) return "olb.exe"; + return "olb-" + os + ".x"; + } + + public static File getWindowsOlbExec() { + return new File(getOlbExecDir(), "olb.exe"); + } + + public static File getOlbExecPath(){ + File dir = new File(getOlbExecDir()); + String os = System.getProperty("os.name"); + if (os.startsWith("Windows")) return getWindowsOlbExec(); + else return new File(dir, "olb-" + os + ".x"); + } + public void stop() { ! stop_ = true; } ! public EfGrid computeGrid(EfGrid _init, ProgressionInterface _prog, DodicoUI _ui) { ! stop_ = false; ! File exe=getOlbExecPath(); ! if (!exe.exists()) { ! if (_ui != null) ! _ui.error("OLB", DodicoResource.getS("Le fichier {0} est introuvable", exe ! .getAbsolutePath())); return null; } File inFile; File outFile; + File dir=exe.getParentFile(); try { ! inFile = File.createTempFile("temp", ".olb_in", dir); ! outFile = File.createTempFile("temp", ".olb_out", dir); } ! catch (IOException e) { return null; ! } ! if (stop_) return null; ! if ((inFile == null) || (outFile == null)) return null; ! DunesAdapter interfaceDunes = new DunesAdapter(); interfaceDunes.setMaillage(_init); ! FileOperationSynthese op = DunesFileFormat.getInstance().getLastVersionImpl().write(inFile, ! interfaceDunes, _prog); ! if (stop_) return null; ! if ((_ui != null) && (op.containsFatalError())) { _ui.error(op.getAnalyze().getFatalError().toString()); return null; } ! ! String[] cmd = new String[3]; ! cmd[0] = exe.getAbsolutePath(); ! cmd[1] = inFile.getName(); ! cmd[2] = outFile.getName(); ! CExec exec = new CExec(cmd); exec.setExecDirectory(dir); exec.exec(); ! if (!outFile.exists()) { return null; } ! op = DunesFileFormat.getInstance().getLastVersionImpl().read(outFile, _prog); ! if ((_ui != null) && (op.containsFatalError())) { _ui.error("OLB", op.getAnalyze().getFatalError().getMessage()); } ! if (inFile != null) inFile.delete(); ! if (outFile != null) outFile.delete(); ! DunesInterface r = (DunesInterface) op.getSource(); ! if (r != null) return r.getGrid(); return null; } ! } \ No newline at end of file |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:33:24
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv778/src/org/fudaa/dodico/reflux/io Modified Files: INPWriter.java Log Message: Maj Index: INPWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/INPWriter.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** INPWriter.java 5 May 2004 12:38:20 -0000 1.15 --- INPWriter.java 11 Jun 2004 16:33:13 -0000 1.16 *************** *** 1,4 **** /* - * @file INPWriter.java * @creation 21 mars 2003 * @modification $Date$ --- 1,3 ---- |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:33:24
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv778/src/org/fudaa/dodico/reflux Modified Files: RefluxExec.java Log Message: Maj Index: RefluxExec.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/RefluxExec.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RefluxExec.java 12 Mar 2004 10:16:10 -0000 1.5 --- RefluxExec.java 11 Jun 2004 16:33:12 -0000 1.6 *************** *** 15,18 **** --- 15,19 ---- import org.fudaa.dodico.calcul.CalculExec; import org.fudaa.dodico.commun.DodicoLib; + import org.fudaa.dodico.commun.DodicoPreferences; import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.commun.DodicoUI; *************** *** 28,73 **** } /** * * */ ! public String[] getLaunchCmd( ! File _paramsFile, ! DodicoUI _ui) { ! String[] param = ! new String[] { DodicoLib.getSansExtension(_paramsFile.getName())}; if (FuLib.isWindows()) { ! File launcher = CalculExec.manageLauncher( ! "reflux", ! "reflux.exe", ! "reflux-launch.tpl.bat", ! "reflux-launch.bat", ! _ui); ! File f = new File("serveurs/reflux/reflux-project.tpl.bat"); ! File dest = new File(_paramsFile.getParentFile(), "reflux-" ! + DodicoLib.getSansExtension(_paramsFile.getName()) + ".bat"); ! if (!DodicoLib.replaceAndCopyFile(f, dest, "@reflux-bat@", launcher.getAbsolutePath(), ! "@project@", DodicoLib.getSansExtension(_paramsFile.getName()))) { ! _ui.error( ! "Copie de fichier", ! "Erreur lors de la copie de " + f); return null; } ! return new String[] {dest.getAbsolutePath()}; } ! else if (FuLib.isLinux()) ! return new String[]{CalculExec.manageLauncher( ! "reflux", ! "reflux-Linux.x", ! "reflux-launch.tpl.sh", ! "reflux-launch.sh", ! _ui).getAbsolutePath(),_paramsFile.getAbsolutePath()}; return null; } /** * @see java.lang.Object#toString() */ public String toString() { ! return DodicoResource.getS("Exécutable"+CtuluLib.ESPACE+"reflux"); } ! } --- 29,98 ---- } + public static String getRefluxExecDir() { + return DodicoPreferences.DODICO.getStringProperty("reflux.exec.dir", new File( + "serveurs/reflux/").getAbsolutePath()); + } + + public static void setRefluxExecDir(String path) { + DodicoPreferences.DODICO.putStringProperty("reflux.exec.dir", path); + } + + public static void unsetRefluxExecDir() { + DodicoPreferences.DODICO.removeProperty("reflux.exec.dir"); + } + + public static File getWindowsRefluxExec() { + return new File(getRefluxExecDir(), getRefluxWindowsName()); + } + + public static String getRefluxName() { + if (FuLib.isWindows()) { + return getRefluxWindowsName(); + } + else if (FuLib.isLinux()) return getRefluxLinuxName(); + return null; + } + + public static String getRefluxWindowsName() { + return "reflux.exe"; + + } + + public static String getRefluxLinuxName() { + return "reflux-Linux.x"; + } + /** * * */ ! public String[] getLaunchCmd(File _paramsFile, DodicoUI _ui) { if (FuLib.isWindows()) { ! File exec = getWindowsRefluxExec(); ! if (!exec.exists()) { ! _ui.error(DodicoResource.getS("Exécutable non trouvé", exec.getAbsolutePath())); return null; } ! File f = new File("serveurs/reflux/reflux-launch.tpl.bat"); ! File dest = new File(_paramsFile.getParentFile(), "reflux-" + _paramsFile.getName() + ".bat"); ! if (!DodicoLib.replaceAndCopyFile(f, dest, "@exe@", exec.getAbsolutePath(), "@project@", ! DodicoLib.getSansExtension(_paramsFile.getName()))) { ! _ui.error("Copie de fichier", "Erreur lors de la copie de " + f); ! return null; ! } ! return new String[] { dest.getAbsolutePath()}; } ! else if (FuLib.isLinux()) ! return new String[] { ! CalculExec.manageLauncher("reflux", "reflux-Linux.x", "reflux-launch.tpl.sh", ! "reflux-launch.sh", _ui).getAbsolutePath(), _paramsFile.getAbsolutePath()}; return null; } + /** * @see java.lang.Object#toString() */ public String toString() { ! return DodicoResource.getS("Exécutable" + CtuluLib.ESPACE + "reflux"); } ! } \ No newline at end of file |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:33:22
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv778/src/org/fudaa/dodico/h2d/type Modified Files: H2dVariableTypeContainer.java H2dVariableType.java H2dBoundaryType.java Added Files: H2dBoundaryHouleType.java Log Message: Maj Index: H2dVariableType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableType.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** H2dVariableType.java 5 May 2004 12:38:34 -0000 1.11 --- H2dVariableType.java 11 Jun 2004 16:33:12 -0000 1.12 *************** *** 209,212 **** --- 209,224 ---- } }; + public static final H2dVariableType CONCENTRATION= + new H2dVariableType(20, H2dResource.getS("Concentration"), null) { + public double getValue(H2dVariableTypeContainer _c) { + return _c.getConcentration(); + } + }; + public static final H2dVariableType EVOLUTION_SEDIMENTAIRE= + new H2dVariableType(21, H2dResource.getS("Valeur évolutions sédimentaires"), null) { + public double getValue(H2dVariableTypeContainer _c) { + return _c.getEvolSedimValue(); + } + }; public final static boolean isTracerVariable(H2dVariableType _t) { return (_t == H2dVariableType.TRACEUR) --- NEW FILE: H2dBoundaryHouleType.java --- /** * @creation 1 juin 2004 * @modification $Date: 2004/06/11 16:33:12 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.type; import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author Fred Deniger * @version $Id: H2dBoundaryHouleType.java,v 1.1 2004/06/11 16:33:12 deniger Exp $ */ public class H2dBoundaryHouleType extends H2dBoundaryType { /** * Bord houle incidente. */ public static H2dBoundaryType LIQUIDE_HOULE_INCIDENCE= new H2dBoundaryType( H2dResource.getS("Liquide houle incidente")); /** * bord sortie libre. */ public static H2dBoundaryType LIQUIDE_SORTIE_LIBRE= new H2dBoundaryType( H2dResource.getS("Liquide sortie libre")); /** * bord houle imposee. */ public static H2dBoundaryType LIQUIDE_HOULE_IMPOSEE= new H2dBoundaryType( H2dResource.getS("Liquide houle imposée")); /** * Tomawac Frontière libre */ public static H2dBoundaryType FRONTIERE_LIBRE= new H2dBoundaryType( H2dResource.getS("Frontière libre")); /** * Tomawac Frontiere a valeurs imposées */ public static H2dBoundaryType FRONTIERE_VALEURS_IMPOSEES= new H2dBoundaryType( H2dResource.getS("Frontière à valeurs imposées")); /** * @param _nom */ public H2dBoundaryHouleType( String _nom) { super(_nom); } /** * @param _nom * @param _isSolide */ public H2dBoundaryHouleType(String _nom, boolean _isSolide) { super(_nom, _isSolide); } } Index: H2dVariableTypeContainer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableTypeContainer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** H2dVariableTypeContainer.java 25 Nov 2003 10:11:37 -0000 1.2 --- H2dVariableTypeContainer.java 11 Jun 2004 16:33:12 -0000 1.3 *************** *** 25,28 **** --- 25,32 ---- */ public double getV(); + public double getConcentration(); + public double getEvolSedimValue(); + + /** * @return tracer Index: H2dBoundaryType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dBoundaryType.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** H2dBoundaryType.java 5 May 2004 12:38:35 -0000 1.4 --- H2dBoundaryType.java 11 Jun 2004 16:33:12 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.h2d.type; + import org.fudaa.dodico.commun.DodicoEnumType; import org.fudaa.dodico.h2d.resource.H2dResource; *************** *** 15,57 **** */ public class H2dBoundaryType extends DodicoEnumType { ! public static H2dBoundaryType MIXTE= ! new H2dBoundaryType(0, H2dResource.getS("Mixte"), true); ! public static H2dBoundaryType SOLIDE= ! new H2dBoundaryType(1, H2dResource.getS("Solide"), true); ! public static H2dBoundaryType SOLIDE_FROTTEMENT= ! new H2dBoundaryType(2, H2dResource.getS("Solide frottement"), true); ! public static H2dBoundaryType LIQUIDE= ! new H2dBoundaryType(3, H2dResource.getS("Liquide")); ! public static H2dBoundaryType LIQUIDE_VITESSES_IMPOSEES= ! new H2dBoundaryType(4, H2dResource.getS("Liquide vitesses imposées")); ! public static H2dBoundaryType LIQUIDE_HAUTEUR_VITESSES_IMPOSEES= ! new H2dBoundaryType( ! 2, ! H2dResource.getS("Liquide hauteur et vitesses imposées")); ! public static H2dBoundaryType LIQUIDE_HAUTEUR_IMPOSEE= ! new H2dBoundaryType(5, H2dResource.getS("Liquide hauteur imposée")); ! public static H2dBoundaryType LIQUIDE_DEBIT_IMPOSE= ! new H2dBoundaryType(6, H2dResource.getS("Liquide débit imposé")); ! public static H2dBoundaryType LIQUIDE_ONDE_INCIDENCE= ! new H2dBoundaryType(7, H2dResource.getS("Liquide onde incidence")); private boolean isLiquide_; /** * */ ! H2dBoundaryType(int _id, String _nom) { ! this(_id, _nom, false); } ! H2dBoundaryType(int _id, String _nom, boolean _isSolide) { ! super(_id, _nom); ! isLiquide_= !_isSolide; } public boolean isLiquide() { return isLiquide_; } public boolean isSolide() { return !isLiquide_; } public boolean equals(H2dBoundaryType _t) { return _t == null ? false : (getId() == _t.getId()); } ! } --- 16,67 ---- */ public class H2dBoundaryType extends DodicoEnumType { ! ! private static int createdIdx_; ! public static H2dBoundaryType MIXTE = new H2dBoundaryType(H2dResource.getS("Mixte"), true); ! public static H2dBoundaryType SOLIDE = new H2dBoundaryType(H2dResource.getS("Solide"), true); ! public static H2dBoundaryType SOLIDE_FROTTEMENT = new H2dBoundaryType(H2dResource ! .getS("Solide frottement"), true); ! public static H2dBoundaryType LIQUIDE = new H2dBoundaryType(H2dResource.getS("Liquide")); ! public static H2dBoundaryType LIQUIDE_VITESSES_IMPOSEES = new H2dBoundaryType(H2dResource ! .getS("Liquide vitesses imposées")); ! public static H2dBoundaryType LIQUIDE_HAUTEUR_VITESSES_IMPOSEES = new H2dBoundaryType(H2dResource ! .getS("Liquide hauteur et vitesses imposées")); ! public static H2dBoundaryType LIQUIDE_HAUTEUR_IMPOSEE = new H2dBoundaryType(H2dResource ! .getS("Liquide hauteur imposée")); ! public static H2dBoundaryType LIQUIDE_DEBIT_IMPOSE = new H2dBoundaryType(H2dResource ! .getS("Liquide débit imposé")); ! public static H2dBoundaryType LIQUIDE_ONDE_INCIDENCE = new H2dBoundaryType(H2dResource ! .getS("Liquide onde incidence")); private boolean isLiquide_; + /** * */ ! protected H2dBoundaryType(String _nom) { ! this(_nom, false); } ! ! protected H2dBoundaryType(String _nom, boolean _isSolide) { ! super(createdIdx_++, _nom); ! isLiquide_ = !_isSolide; } + public boolean isLiquide() { return isLiquide_; } + public boolean isSolide() { return !isLiquide_; } + public boolean equals(H2dBoundaryType _t) { return _t == null ? false : (getId() == _t.getId()); } ! ! public boolean equals(Object _t) { ! if (_t == this) return true; ! else if (_t == null) return false; ! else if (_t instanceof H2dBoundaryType) { return equals((H2dBoundaryType) _t); } ! return false; ! } ! } \ No newline at end of file |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:32:57
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32356/src/org/fudaa/dodico/h2d Modified Files: H2dBcFrontierBlockInterface.java H2dBoundaryCondition.java H2dNodalProperty.java H2dNodalPropertyMixte.java H2dBcManagerBlockAbstract.java H2dBcManagerBlockInterface.java H2dBcManagerMiddleInterface.java H2dBcFrontierBlockAbstract.java H2dBcListener.java Log Message: Index: H2dBcManagerBlockInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerBlockInterface.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dBcManagerBlockInterface.java 12 Feb 2004 15:32:44 -0000 1.3 --- H2dBcManagerBlockInterface.java 11 Jun 2004 16:32:15 -0000 1.4 *************** *** 1,4 **** ! /* ! * @file H2dCLManager.java * @creation 9 sept. 2003 * @modification $Date$ --- 1,3 ---- ! /** * @creation 9 sept. 2003 * @modification $Date$ *************** *** 8,13 **** */ package org.fudaa.dodico.h2d; ! import org.fudaa.dodico.commun.DodicoPermanentList; ! import org.fudaa.dodico.ef.*; /** * @author deniger --- 7,13 ---- */ package org.fudaa.dodico.h2d; ! import java.util.List; ! ! import org.fudaa.dodico.ef.EfGrid; /** * @author deniger *************** *** 16,22 **** public interface H2dBcManagerBlockInterface /*extends H2dBcManagerInterface*/ { /** ! * Renvoie les bords de la frontiere _i */ public H2dBcFrontierBlockInterface getBlockFrontier(int _idxFrontiere); public EfGrid getGrid(); } --- 16,34 ---- public interface H2dBcManagerBlockInterface /*extends H2dBcManagerInterface*/ { /** ! * @param _idxFrontiere l'index de la frontiere globales a considerer ! * @return les bords de la frontiere _idxFrontiere */ public H2dBcFrontierBlockInterface getBlockFrontier(int _idxFrontiere); + /** + * @return la liste des bords utilises + */ + public List getUsedBoundaryType(); + /** + * @return le maillage + */ public EfGrid getGrid(); + /** + * @return le nombre de frontiere geree + */ + public int getNbBoundaryType(); } Index: H2dBcManagerMiddleInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerMiddleInterface.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dBcManagerMiddleInterface.java 12 Feb 2004 15:32:44 -0000 1.3 --- H2dBcManagerMiddleInterface.java 11 Jun 2004 16:32:15 -0000 1.4 *************** *** 9,14 **** package org.fudaa.dodico.h2d; ! import org.fudaa.dodico.ef.*; ! import org.fudaa.dodico.ef.*; /** --- 9,15 ---- package org.fudaa.dodico.h2d; ! import java.util.List; ! ! import org.fudaa.dodico.ef.EfGrid; /** *************** *** 21,24 **** --- 22,38 ---- */ public H2dBcFrontierMiddleInterface getMiddleFrontier(int _idxFrontier); + /** + * @return le maillage + */ public EfGrid getGrid(); + + /** + * @return la liste des bords utilises + */ + public List getUsedBoundaryType(); + + /** + * @return le nombre de type de bord gere + */ + public int getNbBoundaryType(); } Index: H2dBcManagerBlockAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerBlockAbstract.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** H2dBcManagerBlockAbstract.java 1 Jun 2004 11:23:26 -0000 1.5 --- H2dBcManagerBlockAbstract.java 11 Jun 2004 16:32:15 -0000 1.6 *************** *** 8,11 **** --- 8,18 ---- */ package org.fudaa.dodico.h2d; + + import java.util.ArrayList; + import java.util.Collections; + import java.util.HashSet; + import java.util.List; + import java.util.Set; + import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.h2d.type.H2dBoundaryType; *************** *** 14,46 **** * @version $Id$ */ ! public abstract class H2dBcManagerBlockAbstract ! extends H2dBcManagerAbstract ! implements H2dBcManagerBlockInterface { protected H2dBcFrontierBlockInterface[] bordByFrontier_; protected H2dBcManagerBlockAbstract(EfGrid _m) { super(_m); } ! protected H2dBcManagerBlockAbstract( ! EfGrid _m, ! H2dBcFrontierBlockInterface[] _borders) { super(_m); ! bordByFrontier_= _borders; } public final int getNbBcFrontier() { return bordByFrontier_.length; } public final H2dBcFrontierBlockInterface getBlockFrontier(int _i) { return bordByFrontier_[_i]; } /** * Return the number of liquid boundaries. */ public int getNbLiquidBoundary() { ! int n= bordByFrontier_.length; ! int r= 0; ! for (int i= 0; i < n; i++) { ! H2dBcFrontierBlockInterface bordBound= bordByFrontier_[i]; ! int nbBord= bordBound.getNbBord() - 1; ! for (int j= nbBord; j >= 0; j--) { if (bordBound.getBord(j).getType().isLiquide()) { r++; --- 21,56 ---- * @version $Id$ */ ! public abstract class H2dBcManagerBlockAbstract extends H2dBcManagerAbstract implements ! H2dBcManagerBlockInterface { ! protected H2dBcFrontierBlockInterface[] bordByFrontier_; + protected H2dBcManagerBlockAbstract(EfGrid _m) { super(_m); } ! ! protected H2dBcManagerBlockAbstract(EfGrid _m, H2dBcFrontierBlockInterface[] _borders) { super(_m); ! bordByFrontier_ = _borders; } + public final int getNbBcFrontier() { return bordByFrontier_.length; } + public final H2dBcFrontierBlockInterface getBlockFrontier(int _i) { return bordByFrontier_[_i]; } + /** * Return the number of liquid boundaries. */ public int getNbLiquidBoundary() { ! int n = bordByFrontier_.length; ! int r = 0; ! for (int i = 0; i < n; i++) { ! H2dBcFrontierBlockInterface bordBound = bordByFrontier_[i]; ! int nbBord = bordBound.getNbBord() - 1; ! for (int j = nbBord; j >= 0; j--) { if (bordBound.getBord(j).getType().isLiquide()) { r++; *************** *** 50,73 **** return r; } /** * Renvoie le nombre de bord elementaire contenu par ce manager. */ public final int getNbTotalBoudary() { ! int r= 0; ! for (int i= bordByFrontier_.length - 1; i >= 0; i--) { r += bordByFrontier_[i].getNbBord(); } return r; } /** * */ public final H2dBoundary getBoundary(int _idxGeneral) { ! int n= bordByFrontier_.length; ! int shiftL= 0; ! for (int i= 0; i < n; i++) { if (_idxGeneral < (shiftL + bordByFrontier_[i].getNbBord())) { return bordByFrontier_[i].getBord(_idxGeneral - shiftL); ! } else { shiftL += bordByFrontier_[i].getNbBord(); } --- 60,96 ---- return r; } + + public final List getUsedBoundaryType() { + Set s = new HashSet(getNbBoundaryType()); + for (int i = bordByFrontier_.length - 1; i >= 0; i--) { + bordByFrontier_[i].fillWithUsedBoundaryType(s); + } + ArrayList r = new ArrayList(s); + Collections.sort(r); + return r; + } + /** * Renvoie le nombre de bord elementaire contenu par ce manager. */ public final int getNbTotalBoudary() { ! int r = 0; ! for (int i = bordByFrontier_.length - 1; i >= 0; i--) { r += bordByFrontier_[i].getNbBord(); } return r; } + /** * */ public final H2dBoundary getBoundary(int _idxGeneral) { ! int n = bordByFrontier_.length; ! int shiftL = 0; ! for (int i = 0; i < n; i++) { if (_idxGeneral < (shiftL + bordByFrontier_[i].getNbBord())) { return bordByFrontier_[i].getBord(_idxGeneral - shiftL); ! } ! else { shiftL += bordByFrontier_[i].getNbBord(); } *************** *** 75,83 **** return null; } public final H2dBoundary getBoundary(int _frIdx, int _idxOnFrontier) { return getBlockFrontier(_frIdx).getBord(_idxOnFrontier); } protected boolean setBordType(H2dBoundary _b, H2dBoundaryType _type) { ! return _b.setBoundaryType(_type,this); } ! } --- 98,108 ---- return null; } + public final H2dBoundary getBoundary(int _frIdx, int _idxOnFrontier) { return getBlockFrontier(_frIdx).getBord(_idxOnFrontier); } + protected boolean setBordType(H2dBoundary _b, H2dBoundaryType _type) { ! return _b.setBoundaryType(_type, this); } ! } \ No newline at end of file Index: H2dNodalPropertyMixte.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dNodalPropertyMixte.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dNodalPropertyMixte.java 11 Dec 2003 12:41:27 -0000 1.3 --- H2dNodalPropertyMixte.java 11 Jun 2004 16:32:15 -0000 1.4 *************** *** 1,4 **** ! /* ! * @file H2dProprieteElementaire.java * @creation 25 juin 2003 * @modification $Date$ --- 1,3 ---- ! /** * @creation 25 juin 2003 * @modification $Date$ *************** *** 122,125 **** --- 121,128 ---- } + public boolean isFreeAllowed(){ + return true; + } + public int getNbPermanentPt(){ return (indicePermanentValeur_==null?0:indicePermanentValeur_.size()); Index: H2dBcFrontierBlockAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcFrontierBlockAbstract.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** H2dBcFrontierBlockAbstract.java 1 Jun 2004 11:23:26 -0000 1.5 --- H2dBcFrontierBlockAbstract.java 11 Jun 2004 16:32:15 -0000 1.6 *************** *** 11,14 **** --- 11,15 ---- import java.util.Collection; import java.util.HashSet; + import java.util.Set; import org.fudaa.ctulu.CtuluLib; *************** *** 228,239 **** } /** ! * */ public final H2dBoundary getBord(int _idxBord) { if(_idxBord>=bords_.size()) return null; - else return (H2dBoundary)bords_.get(_idxBord); } /** * --- 229,248 ---- } /** ! * @see org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface#getBord(int) */ public final H2dBoundary getBord(int _idxBord) { if(_idxBord>=bords_.size()) return null; return (H2dBoundary)bords_.get(_idxBord); } + + /** + * @param _s la liste a remplir + */ + public final void fillWithUsedBoundaryType(Set _s){ + for(int i=bords_.size()-1;i>=0;i--){ + _s.add(getBord(i).getType()); + } + } /** * Index: H2dBoundaryCondition.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBoundaryCondition.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dBoundaryCondition.java 11 Dec 2003 12:41:27 -0000 1.3 --- H2dBoundaryCondition.java 11 Jun 2004 16:32:15 -0000 1.4 *************** *** 24,27 **** --- 24,37 ---- super(); } + + + public double getEvolSedimValue() { + new Throwable().printStackTrace(); + return 0; + } + public double getConcentration() { + new Throwable().printStackTrace(); + return 0; + } public H2dBoundaryCondition(H2dBoundaryCondition c) { initValuesIntern(c); Index: H2dNodalProperty.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dNodalProperty.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dNodalProperty.java 11 Dec 2003 12:41:27 -0000 1.3 --- H2dNodalProperty.java 11 Jun 2004 16:32:15 -0000 1.4 *************** *** 8,15 **** */ package org.fudaa.dodico.h2d; - import org.fudaa.dodico.h2d.type.H2dVariableType; import gnu.trove.TDoubleProcedure; import gnu.trove.TIntDoubleHashMap; - import gnu.trove.TIntProcedure; /** * @author deniger --- 8,13 ---- Index: H2dBcFrontierBlockInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcFrontierBlockInterface.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** H2dBcFrontierBlockInterface.java 25 Nov 2003 10:11:35 -0000 1.2 --- H2dBcFrontierBlockInterface.java 11 Jun 2004 16:32:15 -0000 1.3 *************** *** 1,4 **** ! /* ! * @file H2dBordParFrontiereInterface.java * @creation 9 sept. 2003 * @modification $Date$ --- 1,3 ---- ! /** * @creation 9 sept. 2003 * @modification $Date$ *************** *** 8,11 **** --- 7,13 ---- */ package org.fudaa.dodico.h2d; + + import java.util.Set; + /** * @author deniger *************** *** 21,24 **** --- 23,31 ---- */ public H2dBoundary getBord(int _idxBord); + + /** + * @param _s la liste a remplir avec les bords utilises + */ + public void fillWithUsedBoundaryType(Set _s); /** * Return the first bord (in boundary numbering) containing the index Index: H2dBcListener.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcListener.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** H2dBcListener.java 1 Jun 2004 11:23:26 -0000 1.4 --- H2dBcListener.java 11 Jun 2004 16:32:15 -0000 1.5 *************** *** 1,9 **** /** - * @file H2dClChangeListener.java * @creation 29 sept. 2003 * @modification $Date$ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne ! * @mail de...@fu... */ package org.fudaa.dodico.h2d; --- 1,8 ---- /** * @creation 29 sept. 2003 * @modification $Date$ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne ! * @mail fud...@li... */ package org.fudaa.dodico.h2d; |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:32:56
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32356/src/org/fudaa/dodico/fichiers Modified Files: FileFormatSoftware.java FileFormat.java Log Message: Index: FileFormatSoftware.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileFormatSoftware.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FileFormatSoftware.java 25 Nov 2003 10:11:34 -0000 1.4 --- FileFormatSoftware.java 11 Jun 2004 16:32:16 -0000 1.5 *************** *** 1,4 **** /* - * @file FileFormatSoftware.java * @creation 14 août 2003 * @modification $Date$ --- 1,3 ---- *************** *** 8,11 **** --- 7,11 ---- */ package org.fudaa.dodico.fichiers; + import com.memoire.bu.BuInformationsSoftware; /** *************** *** 14,32 **** */ public class FileFormatSoftware { ! public final static BuInformationsSoftware TELEMAC_IS= ! new BuInformationsSoftware(); ! public final static BuInformationsSoftware REFLUX_IS= ! new BuInformationsSoftware(); static { ! TELEMAC_IS.name= "telemac"; ! TELEMAC_IS.http= "http://telemacsystem.com"; ! TELEMAC_IS.rights= "LNHE"; ! TELEMAC_IS.contact= "in...@te..."; ! REFLUX_IS.name= "reflux"; ! REFLUX_IS.http= ! "http://www.cetmef.equipement.gouv.fr/projets/hydraulique/reflux/bandeau.html"; ! REFLUX_IS.rights= "CETMEF"; ! REFLUX_IS.contact= "pat...@eq..."; } /** * --- 14,36 ---- */ public class FileFormatSoftware { ! ! public final static BuInformationsSoftware TELEMAC_IS = new BuInformationsSoftware(); ! public final static BuInformationsSoftware REFLUX_IS = new BuInformationsSoftware(); ! public final static BuInformationsSoftware RUBAR_IS = new BuInformationsSoftware(); static { ! TELEMAC_IS.name = "telemac"; ! TELEMAC_IS.http = "http://telemacsystem.com"; ! TELEMAC_IS.rights = "LNHE"; ! TELEMAC_IS.contact = "in...@te..."; ! REFLUX_IS.name = "reflux"; ! REFLUX_IS.http = "http://www.cetmef.equipement.gouv.fr/projets/hydraulique/reflux/bandeau.html"; ! REFLUX_IS.rights = "CETMEF"; ! REFLUX_IS.contact = "pat...@eq..."; ! RUBAR_IS.name = "rubar"; ! RUBAR_IS.http = "http://www.lyon.cemagref.fr/"; ! RUBAR_IS.rights = "CEMAGREF"; ! } + /** * *************** *** 35,37 **** super(); } ! } --- 39,41 ---- super(); } ! } \ No newline at end of file Index: FileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileFormat.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FileFormat.java 30 Apr 2004 07:18:51 -0000 1.9 --- FileFormat.java 11 Jun 2004 16:32:16 -0000 1.10 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.fichiers; + import java.io.File; import java.util.Comparator; *************** *** 15,64 **** import org.fudaa.dodico.commun.DodicoLib; /** - * * @author deniger * @version $Id$ */ public abstract class FileFormat implements Comparable { ! public static final int MODE_ASCII= 0; ! public static final int MODE_BINAIRE= 1; //Le nombre de fichiers demandé par ce format. ! private int nbFile_; ! protected String[] extensions_; ! protected String nom_; ! protected String ID_; ! protected String description_; ! protected int mode_; //le type du fichier projet,maillage,autre,... ! protected int type_; protected BuInformationsSoftware software_; public FileFormat(int _nbFile) { ! if (_nbFile < 1) ! throw new IllegalArgumentException("Nombre de fichier strictement positif"); ! nbFile_= _nbFile; } public int getVersionNb() { return 1; } public String[] getVersions() { return new String[] { getLastVersion()}; } public abstract String getLastVersion(); ! ! public boolean isExtension(String _ext){ ! if(extensions_==null) return false; ! return (DodicoLib.findObject(extensions_, _ext)>=0); } public abstract FileFormatVersion getLastVersionInstance(); /** ! * Si renvoie true, cela signifie que les versions peuvent être ! * castees en FileFormatVersionGrid pour lire un maillage. */ public boolean containsGrid() { return false; } /** * Returns the description. * @return String */ --- 16,83 ---- import org.fudaa.dodico.commun.DodicoLib; /** * @author deniger * @version $Id$ */ public abstract class FileFormat implements Comparable { ! ! public static final int MODE_ASCII = 0; ! public static final int MODE_BINAIRE = 1; //Le nombre de fichiers demandé par ce format. ! private int nbFile_; ! protected String[] extensions_; ! protected String nom_; ! protected String ID_; ! protected String description_; ! protected int mode_; //le type du fichier projet,maillage,autre,... ! protected int type_; protected BuInformationsSoftware software_; + public FileFormat(int _nbFile) { ! if (_nbFile < 1) throw new IllegalArgumentException("Nombre de fichier strictement positif"); ! nbFile_ = _nbFile; } + public int getVersionNb() { return 1; } + public String[] getVersions() { return new String[] { getLastVersion()}; } + public abstract String getLastVersion(); ! ! public boolean isExtension(String _ext) { ! if (extensions_ == null) return false; ! boolean r = (DodicoLib.findObject(extensions_, _ext) >= 0); ! if (!r) return (DodicoLib.findObject(extensions_, _ext.toLowerCase()) >= 0); ! return r; } + /** + * @return la version par defaut + */ public abstract FileFormatVersion getLastVersionInstance(); /** ! * @param _id identifiant permettant de specifier le type de la version ! * @return la version selon l'id ! */ ! public FileFormatVersion getLastVersionInstance(String _id) { ! return getLastVersionInstance(); ! } ! ! /** ! * Si renvoie true, cela signifie que les versions peuvent être castees en FileFormatVersionGrid ! * pour lire un maillage. */ public boolean containsGrid() { return false; } + /** * Returns the description. + * * @return String */ *************** *** 66,74 **** --- 85,96 ---- return description_; } + public String getID() { return ID_; } + /** * Returns the extensions. + * * @return String[] */ *************** *** 76,81 **** --- 98,105 ---- return extensions_; } + /** * Returns the mode. + * * @return int */ *************** *** 83,91 **** --- 107,118 ---- return mode_; } + public int getType() { return type_; } + /** * Returns the nbFile. + * * @return int */ *************** *** 93,98 **** --- 120,127 ---- return nbFile_; } + /** * Returns the nom. + * * @return String */ *************** *** 100,105 **** --- 129,136 ---- return nom_; } + /** * Returns the software. + * * @return BuInformationsSoftware */ *************** *** 107,145 **** return software_; } /** ! * Renvoie a partir du nombre de fichier et des extensions du format les fichiers ! * correspondants (si le nombre de fichier est 1, fichier donne est renvoye). * ! * @return un tableau de taille getNbFile() avec les fichiers existants ! * et correspondant aux extensions. */ public final File[] getFile(File _fInit) { ! File[] r= new File[nbFile_]; ! if (_fInit == null) ! return r; ! if (nbFile_ == 1) ! return new File[] { _fInit }; ! String base= DodicoLib.getSansExtension(_fInit.getAbsolutePath()); ! for (int i= 0; i < nbFile_; i++) { ! r[i]= new File(base + "." + extensions_[i]); } return r; } /** ! * Ce comparateur permet de classer des formats selon leurs nom (ATTENTION 2 ! * formats avec le meme nom seront supposes egaux). */ public static class FileFormatNameComparator implements Comparator { /** ! * Compare 2 FileFormat selon le nom (uniquement). ! */ public int compare(Object o1, Object o2) { if (!(o1 instanceof FileFormat)) ! throw new IllegalArgumentException("o1 doit etre de type FileFormat"); if (!(o2 instanceof FileFormat)) ! throw new IllegalArgumentException("o2 doit etre de type FileFormat"); ! return ((FileFormat)o1).getName().compareTo(((FileFormat)o2).getName()); } } /** * Compare les noms des formats --- 138,178 ---- return software_; } + /** ! * Renvoie a partir du nombre de fichier et des extensions du format les fichiers correspondants ! * (si le nombre de fichier est 1, fichier donne est renvoye). * ! * @return un tableau de taille getNbFile() avec les fichiers existants et correspondant aux ! * extensions. */ public final File[] getFile(File _fInit) { ! File[] r = new File[nbFile_]; ! if (_fInit == null) return r; ! if (nbFile_ == 1) return new File[] { _fInit}; ! String base = DodicoLib.getSansExtension(_fInit.getAbsolutePath()); ! for (int i = 0; i < nbFile_; i++) { ! r[i] = new File(base + "." + extensions_[i]); } return r; } + /** ! * Ce comparateur permet de classer des formats selon leurs nom (ATTENTION 2 formats avec le meme ! * nom seront supposes egaux). */ public static class FileFormatNameComparator implements Comparator { + /** ! * Compare 2 FileFormat selon le nom (uniquement). ! */ public int compare(Object o1, Object o2) { if (!(o1 instanceof FileFormat)) ! throw new IllegalArgumentException("o1 doit etre de type FileFormat"); if (!(o2 instanceof FileFormat)) ! throw new IllegalArgumentException("o2 doit etre de type FileFormat"); ! return ((FileFormat) o1).getName().compareTo(((FileFormat) o2).getName()); } } + /** * Compare les noms des formats *************** *** 147,152 **** public int compareTo(Object o) { if (!(o instanceof FileFormat)) ! throw new IllegalArgumentException("o doit etre de type FileFormat"); ! return getName().compareTo(((FileFormat)o).getName()); } --- 180,185 ---- public int compareTo(Object o) { if (!(o instanceof FileFormat)) ! throw new IllegalArgumentException("o doit etre de type FileFormat"); ! return getName().compareTo(((FileFormat) o).getName()); } *************** *** 157,161 **** return getName(); } - ! } --- 190,193 ---- return getName(); } ! } \ No newline at end of file |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:32:55
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32356/src/org/fudaa/dodico/ef Modified Files: EfGrid.java EfLib.java EfGridSourcesAbstract.java Added Files: EfSegment.java EfSegmentMutable.java EfGridVolume.java EfElementVolume.java Removed Files: EfdSegment.java Log Message: --- NEW FILE: EfElementVolume.java --- /** * @creation 8 juin 2004 * @modification $Date: 2004/06/11 16:32:15 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.ef; /** * Classe décrivant un element d'un maillage voumique * @author Fred Deniger * @version $Id: EfElementVolume.java,v 1.1 2004/06/11 16:32:15 deniger Exp $ */ public class EfElementVolume extends EfElement{ private int[] areteIdx_; /** * Attention, les tableaux ne sont pas recopiés: il ne faut pas les modifier par la suite * @param _areteIdx les indices des aretes * @param _ndsIdx les indices des noeuds : issu des indices des noeuds */ public EfElementVolume(int[] _areteIdx,int[] _ndsIdx) { super(_ndsIdx); areteIdx_=_areteIdx; } /** * @return le nombre d'arete */ public int getNbAretes(){ return areteIdx_.length; } /** * @param _i l'indice local de l'arete * @return l'indice global de l'arete _i */ public int getIdxArete(int _i){ return areteIdx_[_i]; } } Index: EfGrid.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfGrid.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EfGrid.java 31 Mar 2004 08:14:30 -0000 1.3 --- EfGrid.java 11 Jun 2004 16:32:15 -0000 1.4 *************** *** 1,4 **** ! /* ! * @file H2dMaillage.java * @creation 25 juin 2003 * @modification $Date$ --- 1,3 ---- ! /** * @creation 25 juin 2003 * @modification $Date$ *************** *** 30,38 **** [...1743 lines suppressed...] ! n = pts_.length - 1; ! for (int i = n; i >= 0; i--) { ! if (!pts_[i].isSame(_m.pts_[i])) return false; ! } ! return true; ! } ! ! public void printFrontiere() { ! ptsFrontiere_.printFullString(); ! } ! ! /** ! * @param _i l'indice du point a modifier ! * @param _z la nouvelle altitude ! */ ! public void setZFor(int _i, double _z) { ! pts_[_i].setZ(_z); ! } ! } \ No newline at end of file Index: EfGridSourcesAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfGridSourcesAbstract.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EfGridSourcesAbstract.java 12 Feb 2004 15:32:44 -0000 1.1 --- EfGridSourcesAbstract.java 11 Jun 2004 16:32:15 -0000 1.2 *************** *** 25,29 **** public int getTimeStepNb() { ! return 1; } --- 25,29 ---- public int getTimeStepNb() { ! return 0; } --- NEW FILE: EfGridVolume.java --- /** * @creation 9 juin 2004 * @modification $Date: 2004/06/11 16:32:15 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.ef; /** * Un maillage utilisant des elements avec des aretes * @author Fred Deniger * @version $Id: EfGridVolume.java,v 1.1 2004/06/11 16:32:15 deniger Exp $ */ public class EfGridVolume extends EfGrid { EfSegment[] aretes_; /** * @param _pts * @param _elts */ public EfGridVolume(EfNode[] _pts, EfElementVolume[] _elts,EfSegment[] _aretes) { super(_pts, _elts); aretes_=_aretes; } /** * @return le nombre d'arete */ public int getNbAretes(){ return aretes_.length; } public EfSegment getArete(int _idx){ return aretes_[_idx]; } /** * @param _idx l'indice de l'elt * @return l'element "volume" correspondant */ public EfElementVolume getEltVolume(int _idx){ return (EfElementVolume)getElement(_idx); } } --- EfdSegment.java DELETED --- --- NEW FILE: EfSegment.java --- (This appears to be a binary file; contents omitted.) Index: EfLib.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfLib.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EfLib.java 12 Feb 2004 15:32:44 -0000 1.1 --- EfLib.java 11 Jun 2004 16:32:15 -0000 1.2 *************** *** 68,72 **** int n0, n1, n2, n3, n4, n5; //stocke tempo le segment en cours. ! EfdSegment s= new EfdSegment(0, 0); //l'avancement ProgressionUpdater pu= new ProgressionUpdater(_progress); --- 68,72 ---- int n0, n1, n2, n3, n4, n5; //stocke tempo le segment en cours. ! EfSegment s= new EfSegment(0, 0); //l'avancement ProgressionUpdater pu= new ProgressionUpdater(_progress); *************** *** 90,94 **** n1= npoint; //on recupere la correspondance segment -> index ! segmentPtIdx.put(new EfdSegment(s), npoint++); } //point 3 --- 90,94 ---- n1= npoint; //on recupere la correspondance segment -> index ! segmentPtIdx.put(new EfSegment(s), npoint++); } //point 3 *************** *** 100,104 **** t6points.add(_init.getMilieu(n2, n4)); n3= npoint; ! segmentPtIdx.put(new EfdSegment(s), npoint++); } //point 5 --- 100,104 ---- t6points.add(_init.getMilieu(n2, n4)); n3= npoint; ! segmentPtIdx.put(new EfSegment(s), npoint++); } //point 5 *************** *** 110,114 **** t6points.add(_init.getMilieu(n4, n0)); n5= npoint; ! segmentPtIdx.put(new EfdSegment(s), npoint++); } //on cree l'element --- 110,114 ---- t6points.add(_init.getMilieu(n4, n0)); n5= npoint; ! segmentPtIdx.put(new EfSegment(s), npoint++); } //on cree l'element --- NEW FILE: EfSegmentMutable.java --- /** * @creation 8 juin 2004 * @modification $Date: 2004/06/11 16:32:15 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.ef; /** * @author Fred Deniger * @version $Id: EfSegmentMutable.java,v 1.1 2004/06/11 16:32:15 deniger Exp $ */ public class EfSegmentMutable extends EfSegment { /** * @param _pt1 * @param _pt2 */ public EfSegmentMutable(int _pt1, int _pt2) { super(_pt1, _pt2); } /** * @param _s */ public EfSegmentMutable(EfSegment _s) { super(_s); } /** * @see org.fudaa.dodico.ef.EfSegment#setPt1Idx(int) */ public void setPt1Idx(int _i) { super.setPt1Idx(_i); } /** * @see org.fudaa.dodico.ef.EfSegment#setPt2Idx(int) */ public void setPt2Idx(int _i) { super.setPt2Idx(_i); } } |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:32:40
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32356/src/org/fudaa/dodico/commun Modified Files: dodico_en.fr_txt DodicoLib.java Log Message: Index: DodicoLib.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoLib.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** DodicoLib.java 5 May 2004 12:38:35 -0000 1.25 --- DodicoLib.java 11 Jun 2004 16:32:30 -0000 1.26 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.commun; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; *************** *** 41,49 **** /** * Des methodes statiques qui "semblent" utiles [...1053 lines suppressed...] ! for (int i = _prefixe.length - 1; i >= 0; i--) { ! String s = _prefixe[i]; ! if (_lineToTest.startsWith(s)) return s; } return null; } + /** ! * Recherche dans le tableau une chaine contenue dans la ligne a tester (<code>_sToTest</code>). */ ! public static String findStringIn(String[] _stringToLookFor, String _sToTest) { ! for (int i = _stringToLookFor.length - 1; i >= 0; i--) { ! String s = _stringToLookFor[i]; ! if (_sToTest.indexOf(s) >= 0) return s; } return null; } ! } \ No newline at end of file Index: dodico_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/dodico_en.fr_txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** dodico_en.fr_txt 1 Jun 2004 11:23:26 -0000 1.11 --- dodico_en.fr_txt 11 Jun 2004 16:32:30 -0000 1.12 *************** *** 112,114 **** Exécuter=Executer Non compatible=Not compatible ! Le fichier {0} n'existe pas=The file {0} does not exist \ No newline at end of file --- 112,115 ---- Exécuter=Executer Non compatible=Not compatible ! Le fichier {0} n'existe pas=The file {0} does not exist ! Exécutable non trouvé=Executable not found \ No newline at end of file |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:32:40
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32356/src/org/fudaa/dodico/dico Modified Files: DicoModelAbstract.java DicoEntiteComparator.java DicoParams.java DicoEntiteList.java DicoCasFileFormat.java DicoDataType.java DicoCasFileFormatVersionAbstract.java DicoEntite.java Log Message: Index: DicoEntite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntite.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** DicoEntite.java 1 Jun 2004 11:23:25 -0000 1.12 --- DicoEntite.java 11 Jun 2004 16:32:28 -0000 1.13 *************** *** 29,169 **** */ public abstract class DicoEntite implements Comparable { ! public static String[] NIVEAU= ! new String[] { ! DicoResource.getS("Normal"), ! DicoResource.getS("Avancé"), ! DicoResource.getS("Expert")}; ! public final static char QUOTE_CHAR= '\''; ! public final static String QUOTE_STRING= "'"; ! public final static String EMPTY_CHAMP= "' '"; [...1268 lines suppressed...] + public void setNiveau(int i) { + niveau_= i; + } /** * Ce mot-clé est nécessaire a l'appli *************** *** 856,858 **** --- 846,857 ---- isRequired_= _b; } + /** + * @return + */ + public void setRubrique(String _s) { + rubrique_= _s; + } + public void setType(DicoDataType type) { + type_= type; + } } Index: DicoCasFileFormatVersionAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasFileFormatVersionAbstract.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DicoCasFileFormatVersionAbstract.java 12 Dec 2003 10:30:53 -0000 1.4 --- DicoCasFileFormatVersionAbstract.java 11 Jun 2004 16:32:28 -0000 1.5 *************** *** 35,38 **** --- 35,42 ---- return dico_.getCodeName() + CtuluLib.ESPACE + dico_.getVersion(); } + + public String getCodeName(){ + return dico_.getCodeName(); + } public abstract DicoEntite getFichierPrincipalEntite(); public abstract DicoEntite getTitreEntite(); Index: DicoEntiteComparator.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntiteComparator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DicoEntiteComparator.java 25 Nov 2003 10:11:28 -0000 1.4 --- DicoEntiteComparator.java 11 Jun 2004 16:32:16 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.dico; + import java.util.Comparator; /** *************** *** 14,94 **** */ public abstract class DicoEntiteComparator implements Comparator { private static Rubrique RUBRIQUE; private static Rubrique RUBRIQUE_REVERSE; public static Rubrique RUBRIQUE() { if (RUBRIQUE == null) { synchronized (Rubrique.class) { ! if (RUBRIQUE == null) ! RUBRIQUE= new Rubrique(); } } return RUBRIQUE; } public static Rubrique RUBRIQUE_REVERSE() { if (RUBRIQUE_REVERSE == null) { synchronized (Rubrique.class) { ! if (RUBRIQUE_REVERSE == null) ! RUBRIQUE_REVERSE= new Rubrique(true); } } return RUBRIQUE_REVERSE; } private static Entite ENTITE; private static Entite ENTITE_REVERSE; public static Entite ENTITE() { if (ENTITE == null) { synchronized (Entite.class) { ! if (ENTITE == null) ! ENTITE= new Entite(); } } return ENTITE; } public static Entite ENTITE_REVERSE() { if (ENTITE_REVERSE == null) { synchronized (Entite.class) { ! if (ENTITE_REVERSE == null) ! ENTITE_REVERSE= new Entite(true); } } return ENTITE_REVERSE; } boolean reverse_; public DicoEntiteComparator() {} public boolean isReverse() { return reverse_; } public DicoEntiteComparator(boolean _reverse) { ! reverse_= _reverse; } /** * */ public int compare(Object o1, Object o2) { ! if (o1 == o2) ! return 0; ! if ((o1 == null) || (o2 == null)) ! throw new IllegalArgumentException("Argument null"); ! if (o1.equals(o2)) ! return 0; ! int r= compareField((DicoEntite)o1, (DicoEntite)o2); ! r= reverse_ ? -r : r; ! if (r == 0) ! r= ((DicoEntite)o1).compareTo((DicoEntite)o2); return r; } public abstract int compareField(DicoEntite e1, DicoEntite e2); private final static class Entite extends DicoEntiteComparator { public Entite() {} public Entite(boolean _b) { super(_b); } /** ! * ! */ public int compare(Object o1, Object o2) { ! int r= ((DicoEntite)o1).compareTo((DicoEntite)o2); return reverse_ ? -r : r; } /** * --- 15,117 ---- */ public abstract class DicoEntiteComparator implements Comparator { + private static Rubrique RUBRIQUE; private static Rubrique RUBRIQUE_REVERSE; + public static Rubrique RUBRIQUE() { if (RUBRIQUE == null) { synchronized (Rubrique.class) { ! if (RUBRIQUE == null) RUBRIQUE = new Rubrique(); } } return RUBRIQUE; } + public static Rubrique RUBRIQUE_REVERSE() { if (RUBRIQUE_REVERSE == null) { synchronized (Rubrique.class) { ! if (RUBRIQUE_REVERSE == null) RUBRIQUE_REVERSE = new Rubrique(true); } } return RUBRIQUE_REVERSE; } + private static Entite ENTITE; private static Entite ENTITE_REVERSE; + public static Entite ENTITE() { if (ENTITE == null) { synchronized (Entite.class) { ! if (ENTITE == null) ENTITE = new Entite(); } } return ENTITE; } + public static Entite ENTITE_REVERSE() { if (ENTITE_REVERSE == null) { synchronized (Entite.class) { ! if (ENTITE_REVERSE == null) ENTITE_REVERSE = new Entite(true); } } return ENTITE_REVERSE; } + boolean reverse_; + public DicoEntiteComparator() {} + public boolean isReverse() { return reverse_; } + public DicoEntiteComparator(boolean _reverse) { ! reverse_ = _reverse; } + /** * */ public int compare(Object o1, Object o2) { ! if (o1 == o2) return 0; ! if ((o1 == null) || (o2 == null)) throw new IllegalArgumentException("Argument null"); ! if (o1.equals(o2)) return 0; ! int r = compareField((DicoEntite) o1, (DicoEntite) o2); ! r = reverse_ ? -r : r; ! if (r == 0) r = ((DicoEntite) o1).compareTo((DicoEntite) o2); return r; } + public abstract int compareField(DicoEntite e1, DicoEntite e2); + + public final static class Index extends DicoEntiteComparator { + + public Index() {} + + public Index(boolean _b) { + super(_b); + } + + public int compareField(DicoEntite _e1, DicoEntite _e2) { + return _e1.getIndex() - _e2.getIndex(); + } + } + private final static class Entite extends DicoEntiteComparator { + public Entite() {} + public Entite(boolean _b) { super(_b); } + /** ! * ! */ public int compare(Object o1, Object o2) { ! int r = ((DicoEntite) o1).compareTo((DicoEntite) o2); return reverse_ ? -r : r; } + /** * *************** *** 98,142 **** } } private final static class Rubrique extends DicoEntiteComparator { public Rubrique() {} public Rubrique(boolean _b) { super(_b); } public int compareField(DicoEntite e1, DicoEntite e2) { return e1.getRubrique().compareTo(e2.getRubrique()); } } public final static class TypeDescription extends DicoEntiteComparator { public TypeDescription() {} public TypeDescription(boolean _b) { super(_b); } public int compareField(DicoEntite e1, DicoEntite e2) { ! return e1.getType().getDescription().compareTo( ! e2.getType().getDescription()); } } public interface ComparatorValueInterface { String getValue(DicoEntite _e); } public final static class Value extends DicoEntiteComparator { ComparatorValueInterface entitesValues_; public Value(ComparatorValueInterface _entiteValues, boolean _b) { super(_b); ! entitesValues_= _entiteValues; } public Value(ComparatorValueInterface _entiteValues) { ! entitesValues_= _entiteValues; } public ComparatorValueInterface getValueInterface() { return entitesValues_; } public int compareField(DicoEntite e1, DicoEntite e2) { return getValue(e1).compareTo(getValue(e2)); } private String getValue(DicoEntite _e) { ! String r= entitesValues_.getValue(_e); return r == null ? _e.getDefautValue() : r; } } ! } --- 121,181 ---- } } + private final static class Rubrique extends DicoEntiteComparator { + public Rubrique() {} + public Rubrique(boolean _b) { super(_b); } + public int compareField(DicoEntite e1, DicoEntite e2) { return e1.getRubrique().compareTo(e2.getRubrique()); } } + public final static class TypeDescription extends DicoEntiteComparator { + public TypeDescription() {} + public TypeDescription(boolean _b) { super(_b); } + public int compareField(DicoEntite e1, DicoEntite e2) { ! return e1.getType().getDescription().compareTo(e2.getType().getDescription()); } } + public interface ComparatorValueInterface { + String getValue(DicoEntite _e); } + public final static class Value extends DicoEntiteComparator { + ComparatorValueInterface entitesValues_; + public Value(ComparatorValueInterface _entiteValues, boolean _b) { super(_b); ! entitesValues_ = _entiteValues; } + public Value(ComparatorValueInterface _entiteValues) { ! entitesValues_ = _entiteValues; } + public ComparatorValueInterface getValueInterface() { return entitesValues_; } + public int compareField(DicoEntite e1, DicoEntite e2) { return getValue(e1).compareTo(getValue(e2)); } + private String getValue(DicoEntite _e) { ! String r = entitesValues_.getValue(_e); return r == null ? _e.getDefautValue() : r; } } ! } \ No newline at end of file Index: DicoDataType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoDataType.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DicoDataType.java 12 Dec 2003 10:30:53 -0000 1.9 --- DicoDataType.java 11 Jun 2004 16:32:28 -0000 1.10 *************** *** 113,117 **** */ public String getDescription() { ! return "Logique"; } /** --- 113,117 ---- */ public String getDescription() { ! return DicoResource.getS("Logique"); } /** Index: DicoCasFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasFileFormat.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DicoCasFileFormat.java 11 Dec 2003 12:41:26 -0000 1.8 --- DicoCasFileFormat.java 11 Jun 2004 16:32:28 -0000 1.9 *************** *** 1,3 **** ! /* * @file TelemacCasFileFormat.java * @creation 14 avr. 2003 --- 1,3 ---- ! /** * @file TelemacCasFileFormat.java * @creation 14 avr. 2003 Index: DicoEntiteList.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntiteList.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DicoEntiteList.java 25 Nov 2003 10:11:29 -0000 1.5 --- DicoEntiteList.java 11 Jun 2004 16:32:28 -0000 1.6 *************** *** 94,99 **** */ public Object[] toArray(Object[] a) { - if (a instanceof DicoEntite[]) - throw new ArrayStoreException(); if (a.length < size_) return toArray(); --- 94,97 ---- Index: DicoModelAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoModelAbstract.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DicoModelAbstract.java 12 Dec 2003 10:30:53 -0000 1.9 --- DicoModelAbstract.java 11 Jun 2004 16:32:16 -0000 1.10 *************** *** 86,89 **** --- 86,91 ---- } public int getEntiteNombre() { + if (entites_ == null) + initEntite(); return entites_.size(); } Index: DicoParams.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParams.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** DicoParams.java 1 Jun 2004 11:23:25 -0000 1.18 --- DicoParams.java 11 Jun 2004 16:32:16 -0000 1.19 *************** *** 45,48 **** --- 45,55 ---- this(_i == null ? null : _i.getInputs(), _i == null ? null : _i.getComments(), _dico); } + + /** + * @return le nom du code + */ + public String getCodeName(){ + return ft_.getCodeName(); + } /** |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:32:40
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/resource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32356/src/org/fudaa/dodico/h2d/resource Modified Files: h2d_en.fr_txt Log Message: Index: h2d_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** h2d_en.fr_txt 1 Jun 2004 11:23:27 -0000 1.2 --- h2d_en.fr_txt 11 Jun 2004 16:32:30 -0000 1.3 *************** *** 231,233 **** Les courbes suivantes ne contiennent pas les bornes de la simulation=The following curves don't contain the bounds of the simulation Le nombre de noeuds annoncé par le fichier dat est incorrect=The "dat" contains a wrong number of nodes ! Le nombre de noeuds lu est incorrect=The number of nodes is wrong \ No newline at end of file --- 231,244 ---- Les courbes suivantes ne contiennent pas les bornes de la simulation=The following curves don't contain the bounds of the simulation Le nombre de noeuds annoncé par le fichier dat est incorrect=The "dat" contains a wrong number of nodes ! Le nombre de noeuds lu est incorrect=The number of nodes is wrong ! Liquide houle incidente=Liquid incident wave ! Liquide sortie libre=Liquid free exit ! Liquide houle imposée=Liquid prescribed wave ! Le type de bord est incompatible avec le projet=The boundary's type is not adapted for this project ! Frontière libre=Free boundary ! Frontière à valeurs imposées=Boundary with prescribed values ! Concentration=Concentration ! Valeur évolutions sédimentaires=Sedimentary evolutions value ! Le nombre de points pour une arête est incorrect=The number of declared points for a segment is not valid ! Le nombre d'arêtes limites lu (NAS) n'est pas cohérent=The number of boundary edges (NAS) is not coherent ! L'arête {0} n'est pas une arête limite=The edge number {0} is not a boundary edge \ No newline at end of file |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:32:39
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32356/src/org/fudaa/dodico/calcul Modified Files: CalculExec.java Log Message: Index: CalculExec.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculExec.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CalculExec.java 1 Jun 2004 11:23:25 -0000 1.7 --- CalculExec.java 11 Jun 2004 16:32:29 -0000 1.8 *************** *** 43,50 **** public void launch(File _f, CExecListener _l) { ! if (ui_ == null) ! ui_ = DodicoUIDefault.INSTANCE; String[] cmd = getLaunchCmd(_f, ui_); if (launchInNewTerm_) cmd = getCmdWithNewTermCmd(cmd); DodicoLib.printStringArray(cmd); CExec ex = new CExec(cmd); --- 43,53 ---- public void launch(File _f, CExecListener _l) { ! if (ui_ == null) ui_ = DodicoUIDefault.INSTANCE; String[] cmd = getLaunchCmd(_f, ui_); if (launchInNewTerm_) cmd = getCmdWithNewTermCmd(cmd); + if (cmd == null) { + new Throwable().printStackTrace(); + return; + } DodicoLib.printStringArray(cmd); CExec ex = new CExec(cmd); *************** *** 53,61 **** ex.setExecDirectory(_f.getParentFile()); } - // if (pathForExec_ != null){ - // Runtime.getRuntime(); - // ex.setEnvVariable(new String[] { "PATH=" + pathForExec_ }); - // } - ex.setErrStream(outError_); ex.setOutStream(outStandard_); --- 56,59 ---- *************** *** 67,71 **** try { ex.exec(); ! } catch (RuntimeException _e) { _e.printStackTrace(); ui_.error("Calcul termine avec erreur", _e.getMessage()); --- 65,70 ---- try { ex.exec(); ! } ! catch (RuntimeException _e) { _e.printStackTrace(); ui_.error("Calcul termine avec erreur", _e.getMessage()); *************** *** 106,112 **** s.append(CtuluLib.ESPACE).append(_cmd[i]); } ! String cmd = ! DodicoPreferences.DODICO.getStringProperty("cexec.term.launch", null); ! String[] deb=null; if (cmd != null) { String[] init = DodicoLib.parseString(cmd, CtuluLib.ESPACE); --- 105,110 ---- s.append(CtuluLib.ESPACE).append(_cmd[i]); } ! String cmd = DodicoPreferences.DODICO.getStringProperty("cexec.term.launch", null); ! String[] deb = null; if (cmd != null) { String[] init = DodicoLib.parseString(cmd, CtuluLib.ESPACE); *************** *** 115,128 **** System.arraycopy(init, 0, deb, 0, nInit); } ! if(deb==null) deb = getTermCmd(); String[] r = new String[deb.length + 1]; System.arraycopy(deb, 0, r, 0, deb.length); ! r[r.length - 1] = "\""+s.toString()+"\""; return r; } ! public abstract String[] getLaunchCmd( ! File _paramsFile, ! DodicoUI _ui); /** --- 113,124 ---- System.arraycopy(init, 0, deb, 0, nInit); } ! if (deb == null) deb = getTermCmd(); String[] r = new String[deb.length + 1]; System.arraycopy(deb, 0, r, 0, deb.length); ! r[r.length - 1] = "\"" + s.toString() + "\""; return r; } ! public abstract String[] getLaunchCmd(File _paramsFile, DodicoUI _ui); /** *************** *** 135,144 **** * @return renvoie un tableau du type [_launchFile,_launcherArgs[0],_launcherArgs[i],...] */ ! public static File manageLauncher( ! String _serveurName, ! String _exeFile, ! String _launchtplFile, ! String _launchFile, ! DodicoUI _ui) { File serveurDir = new File("serveurs/" + _serveurName + "/"); File launchFile = new File(serveurDir, _launchFile); --- 131,136 ---- * @return renvoie un tableau du type [_launchFile,_launcherArgs[0],_launcherArgs[i],...] */ ! public static File manageLauncher(String _serveurName, String _exeFile, String _launchtplFile, ! String _launchFile, DodicoUI _ui) { File serveurDir = new File("serveurs/" + _serveurName + "/"); File launchFile = new File(serveurDir, _launchFile); *************** *** 148,154 **** String newToken = serveur.getAbsolutePath(); if (!DodicoLib.replaceAndCopyFile(in, launchFile, "@exe@", newToken)) { ! _ui.error( ! "Copie de fichier", ! "Erreur lors de la copie de " + _launchtplFile); } } --- 140,144 ---- String newToken = serveur.getAbsolutePath(); if (!DodicoLib.replaceAndCopyFile(in, launchFile, "@exe@", newToken)) { ! _ui.error("Copie de fichier", "Erreur lors de la copie de " + _launchtplFile); } } *************** *** 157,161 **** /** ! * * */ public PrintStream getOutError() { --- 147,151 ---- /** ! * * */ public PrintStream getOutError() { *************** *** 164,168 **** /** ! * * */ public PrintStream getOutStandard() { --- 154,158 ---- /** ! * * */ public PrintStream getOutStandard() { *************** *** 171,175 **** /** ! * * */ public void setOutError(PrintStream _writer) { --- 161,165 ---- /** ! * * */ public void setOutError(PrintStream _writer) { *************** *** 178,182 **** /** ! * * */ public void setOutStandard(PrintStream _writer) { --- 168,172 ---- /** ! * * */ public void setOutStandard(PrintStream _writer) { *************** *** 209,218 **** */ public void setUI(DodicoUI _dodicoUI) { ! if (_dodicoUI != null) ! ui_ = _dodicoUI; } /** ! * * */ public boolean isChangeWorkingDirectory() { --- 199,207 ---- */ public void setUI(DodicoUI _dodicoUI) { ! if (_dodicoUI != null) ui_ = _dodicoUI; } /** ! * * */ public boolean isChangeWorkingDirectory() { *************** *** 221,225 **** /** ! * * */ public boolean isLauchInNewTerm() { --- 210,214 ---- /** ! * * */ public boolean isLauchInNewTerm() { *************** *** 228,232 **** /** ! * * */ public String getPathForExec() { --- 217,221 ---- /** ! * * */ public String getPathForExec() { *************** *** 235,239 **** /** ! * * */ public void setChangeWorkingDirectory(boolean _b) { --- 224,228 ---- /** ! * * */ public void setChangeWorkingDirectory(boolean _b) { *************** *** 242,246 **** /** ! * * */ public void setLauchInNewTerm(boolean _b) { --- 231,235 ---- /** ! * * */ public void setLauchInNewTerm(boolean _b) { *************** *** 249,256 **** /** ! * * */ public void setPathForExec(String _string) { pathForExec_ = _string; } ! } --- 238,245 ---- /** ! * * */ public void setPathForExec(String _string) { pathForExec_ = _string; } ! } \ No newline at end of file |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:32:25
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32356/src/org/fudaa/dodico/h2d/rubar Added Files: H2dRubarBcTypeList.java H2dRubarParameters.java H2dRubarDicoModel.java H2dRubarArete.java H2dRubarBoundaryType.java H2dRubarGridAreteSource.java H2dRubarProjectDispatcherListener.java H2dRubarGrid.java H2dRubarBcMng.java Log Message: --- NEW FILE: H2dRubarDicoModel.java --- /** * @creation 11 juin 2004 * @modification $Date: 2004/06/11 16:32:16 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.rubar; import org.fudaa.dodico.dico.DicoDataType; import org.fudaa.dodico.dico.DicoEntite; import org.fudaa.dodico.dico.DicoModelAbstract; /** * @author Fred Deniger * @version $Id: H2dRubarDicoModel.java,v 1.1 2004/06/11 16:32:16 deniger Exp $ */ public class H2dRubarDicoModel extends DicoModelAbstract { /** * */ public H2dRubarDicoModel() { super(); } /** * @param _language */ public H2dRubarDicoModel(String _language) { super(_language); } /** * @param _language */ public H2dRubarDicoModel(int _language) { super(_language); } /** * @see org.fudaa.dodico.dico.DicoModelAbstract#getVersion() */ public String getVersion() { return "1.0"; } /** * @see org.fudaa.dodico.dico.DicoModelAbstract#createNoms() */ protected String[] createNoms() { return null; } /** * @see org.fudaa.dodico.dico.DicoModelAbstract#createEntites() */ protected DicoEntite[] createEntites() { DicoEntite[] r = new DicoEntite[25]; DicoDataType.Binaire typeBinaire = DicoDataType.Binaire.EMPTY; int index = 0; String[] t = new String[2]; String[] rGeneral = new String[] { "Général", "General"}; t[0] = "Reprise de calcul"; t[1] = "Computation continued"; DicoEntite.Simple ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "false"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); DicoDataType.Reel type = new DicoDataType.Reel(); type.setControle(0); t[0] = "Précision sur les hauteurs"; t[1] = "Precision for elevation"; ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setIndex(index); ent.setNiveau(0); t[0] = t[1] = "10-4"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); type = new DicoDataType.Reel(); type.setControle(0); t[0] = "Accélération de la pesanteur"; t[1] = "Gravity acceleration"; ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setIndex(index); ent.setNiveau(0); t[0] = t[1] = "9.81"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); type = new DicoDataType.Reel(); type.setControle(0); t[0] = "Temps début du calcul"; t[1] = "Computation start time"; ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setIndex(index); ent.setNiveau(0); t[0] = t[1] = "0.0"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); type = new DicoDataType.Reel(); type.setControle(0); t[0] = "Temps fin calcul"; t[1] = "Computation end time"; ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setIndex(index); ent.setNiveau(0); ent.isRequired(); t[0] = t[1] = "0.0"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); type = new DicoDataType.Reel(); type.setControle(0); t[0] = "Valeur pas de temps initial"; t[1] = "Initial time step"; ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setRequired(true); ent.setIndex(index); ent.setNiveau(0); t[0] = t[1] = "1.0"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Calcul à nombre de Courant constant"; t[1] = "Computation with constant \"Courant\" number"; ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire); ent.setIndex(index); ent.setNiveau(0); t[0] = t[1] = "false"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); type = new DicoDataType.Reel(); type.setControle(0, 1); t[0] = "Valeur du nombre Courant"; t[1] = "\"Courant\" value"; ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setIndex(index); ent.setNiveau(0); t[0] = t[1] = "0.5"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); DicoDataType.Entier typeE = new DicoDataType.Entier(); typeE.setChoice(new String[] { "0", "1", "2"}, new String[] { "G", "Van Leer ordre 1", "Van Leer ordre 2"}); t[0] = "Schéma calcul"; t[1] = "Computation scheme"; ent = new DicoEntite.Simple(t[languageIndex_], typeE); ent.setIndex(index); ent.setNiveau(0); t[0] = t[1] = "2"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Conditions limites variables dans le temps"; t[1] = "Boundary conditions depending on time"; ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "false"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Correction de Van Leer"; t[1] = "Van Leer correction"; type = new DicoDataType.Reel(); type.setControle(0.5, 1); ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "0.6"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Ouvrages"; t[1] = "Works"; typeE = new DicoDataType.Entier(); String[] chx = new String[] { "0", "1", "2", "3"}; if (languageIndex_ == 0) typeE.setChoice(chx, new String[] { "Pas d'ouvrage/Pas d'apport de pluie", "Ouvrage/Pas d'apport de pluie", "Pas d'ouvrage/Apport de pluie", "Ouvrage/Apport de pluie"}); else typeE.setChoice(chx, new String[] { "No works/no rain inflow", "Works/No rain inflow", "No works/Rain inflow", "Works/Rain inflow"}); ent = new DicoEntite.Simple(t[languageIndex_], typeE); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "1"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Définition du frottement"; t[1] = "Friction definition"; typeE = new DicoDataType.Entier(); chx = new String[] { "0", "1"}; typeE.setChoice(chx, new String[] { "Strickler", "Chezy"}); ent = new DicoEntite.Simple(t[languageIndex_], typeE); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "1"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Pas de temps de sauvegarde"; t[1] = "Save time step"; type = new DicoDataType.Reel(); type.setControle(0); ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setNiveau(0); ent.setIndex(index); ent.setRequired(true); t[0] = t[1] = "1"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); rGeneral = new String[] { "Fichiers résultats", "Results file"}; t[0] = "fichier hyrdrogrammes (TRC)"; t[1] = "File hydrograph (TRC)"; ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "false"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Edition maillage (EDM)"; t[1] = "Grid Edition (EDM)"; ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "false"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Edition des conditions limites(ECL)"; t[1] = "Boundary conditions edition (ECL)"; ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "false"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Edition des conditions initiales (ECI)"; t[1] = "Initial condition edition (ECI)"; ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "false"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Edition des frottements de fond (EFR)"; t[1] = "Bottom friction edition (EFR)"; ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "false"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Valeurs aux arêtes entrantes,sortantes et sur les ouvrages (OUT)"; t[1] = "Values for inflowing/outflowing edges et for works (OUT)"; ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "false"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); t[0] = "Maxima des résultats depuis le début du calcul (ENV)"; t[1] = "Maximal values from the computation beginning (ENV)"; ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "false"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); rGeneral = new String[] { "Général", "General"}; type = new DicoDataType.Reel(); type.setControle(0); t[0] = "Constante de viscosité (ou diffusion)"; t[1] = "Viscosity constante (or diffusion)"; ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "0"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); type = new DicoDataType.Reel(); type.setControle(0); t[0] = "Coefficient de frottement à la paroi"; t[1] = "Friction coefficient for wall"; ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "0"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); type = new DicoDataType.Reel(); type.setControle(0); t[0] = "Vitesse du vent selon X"; t[1] = "Wind velocity along X"; ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "0"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); type = new DicoDataType.Reel(); type.setControle(0); t[0] = "Vitesse du vent selon Y"; t[1] = "Wind velocity along Y"; ent = new DicoEntite.Simple(t[languageIndex_], type); ent.setNiveau(0); ent.setIndex(index); t[0] = t[1] = "0"; ent.setDefautValue(t[languageIndex_]); ent.setRubrique(rGeneral[languageIndex_]); r[index++] = ent.getImmutable(); return r; } /** * @see org.fudaa.dodico.dico.DicoModelAbstract#getCodeName() */ public String getCodeName() { return "rubar"; } } --- NEW FILE: H2dRubarArete.java --- /** * @creation 9 juin 2004 * @modification $Date: 2004/06/11 16:32:16 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.rubar; import org.fudaa.dodico.ef.EfSegment; /** * @author Fred Deniger * @version $Id: H2dRubarArete.java,v 1.1 2004/06/11 16:32:16 deniger Exp $ */ public class H2dRubarArete extends EfSegment { H2dRubarBoundaryType type_; /** * @param _pt1 * @param _pt2 */ public H2dRubarArete(int _pt1, int _pt2, H2dRubarBoundaryType _t) { super(_pt1, _pt2); type_ = _t; } /** * @param _s */ public H2dRubarArete(H2dRubarArete _s) { super(_s); initRubarDataOnly(_s); } /** * @return true si arete externe et liquide */ public boolean isExternAndLiquid() { return isExtern() && (type_.isLiquide()); } /** * @return une arete identique a celle-ci. */ public H2dRubarArete createMemento() { return new H2dRubarArete(this); } /** * Recupere uniquement les donnees propres a rubar (attention !) * @param _a l'arete source */ private void initRubarDataOnly(H2dRubarArete _a) { type_ = _a.type_; } /** * Recupere toutes les donnes depuis l'aretes passees en parametres * @param _a l'arete memento */ protected void initFromMemento(H2dRubarArete _a) { super.initFromSegment(_a); initRubarDataOnly(_a); } protected boolean setType(H2dRubarBoundaryType _t) { if (_t == null) return false; if (type_ == null) { new Throwable("Interdit de modifier le type d'une arete interne").printStackTrace(); return false; } if (_t.equals(H2dRubarBcTypeList.MIXTE)) { new Throwable("Mixte n'est pas un type valide").printStackTrace(); return false; } if (!_t.equals(type_)) { type_ = _t; return true; } return false; } /** * @return true si externe */ public boolean isExtern() { return type_ != null; } /** * @return */ public H2dRubarBoundaryType getType() { return type_; } /** * @param _ar le tableau des aretes a tester * @return si une arete est intérieure renvoie null. Si toutes les aretes de meme type, renvoie le * type commun. Sinon renvoie mixte. */ public static H2dRubarBoundaryType getCommonType(H2dRubarArete[] _ar) { if ((_ar == null) || (_ar.length == 0)) return null; H2dRubarBoundaryType r = _ar[0].getType(); if (r == null) return r; H2dRubarBoundaryType rt; for (int i = _ar.length - 1; i >= 1; i--) { rt = _ar[i].getType(); if (rt == null) return null; else if (!rt.equals(r)) r = H2dRubarBcTypeList.MIXTE; } return r; } } --- NEW FILE: H2dRubarBcTypeList.java --- /** * @creation 9 juin 2004 * @modification $Date: 2004/06/11 16:32:16 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.rubar; import java.util.Iterator; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author Fred Deniger * @version $Id: H2dRubarBcTypeList.java,v 1.1 2004/06/11 16:32:16 deniger Exp $ */ public final class H2dRubarBcTypeList { private static DodicoPermanentList list_; /** * @return la liste des types supportés par rubar */ public static DodicoPermanentList getList() { if (list_ == null) { list_ = new DodicoPermanentList(DodicoLib.sort(new H2dRubarBoundaryType[] { SOLIDE, LIBRE, COTE_EAU, COTE_EAU_DEBIT_TANGENTIELLE, CRITIQUE, DEBIT, DEBIT_31, DEBIT_32, DEBIT_33, DEBIT_34, DEBIT_35, DEBIT_36, DEBIT_37, DEBIT_38, DEBIT_39, TARAGE})); } return list_; } /** * @param _idx l'indice a tester * @return le type ayant le meme indice 'rubar'. null si aucun */ public static H2dRubarBoundaryType getExternType(int _idx) { DodicoPermanentList list = getList(); H2dRubarBoundaryType t; for (Iterator it = list.iterator(); it.hasNext();) { t = (H2dRubarBoundaryType) it.next(); if (_idx == t.getRubarIdx()) return t; } return null; } /** * Type de bord solid rubar=2 */ public static H2dRubarBoundaryType SOLIDE = new H2dRubarBoundaryType(H2dResource.getS("Solide"), true, 2); /** * rubar =1 */ public static H2dRubarBoundaryType LIBRE = new H2dRubarBoundaryType(H2dResource.getS("Libre"), true, 1); /** * rubar =3 */ public static H2dRubarBoundaryType DEBIT = new H2dRubarBoundaryType(H2dResource .getS("Débit imposé"), true, 3); /** * rubar =31 */ public static H2dRubarBoundaryType DEBIT_31 = new H2dRubarBoundaryType(H2dResource .getS("Débit imposé") + " Group 1", true, 31); /** * rubar =32 */ public static H2dRubarBoundaryType DEBIT_32 = new H2dRubarBoundaryType(H2dResource .getS("Débit imposé") + " Group 2", true, 32); /** * rubar =33 */ public static H2dRubarBoundaryType DEBIT_33 = new H2dRubarBoundaryType(H2dResource .getS("Débit imposé") + " Group 3", true, 33); /** * rubar =34 */ public static H2dRubarBoundaryType DEBIT_34 = new H2dRubarBoundaryType(H2dResource .getS("Débit imposé") + " Group 4", true, 34); /** * rubar =35 */ public static H2dRubarBoundaryType DEBIT_35 = new H2dRubarBoundaryType(H2dResource .getS("Débit imposé") + " Group 5", true, 35); /** * rubar =36 */ public static H2dRubarBoundaryType DEBIT_36 = new H2dRubarBoundaryType(H2dResource .getS("Débit imposé") + " Group 6", true, 36); /** * rubar =37 */ public static H2dRubarBoundaryType DEBIT_37 = new H2dRubarBoundaryType(H2dResource .getS("Débit imposé") + " Group 7", true, 37); /** * rubar =38 */ public static H2dRubarBoundaryType DEBIT_38 = new H2dRubarBoundaryType(H2dResource .getS("Débit imposé") + " Group 8", true, 38); /** * rubar =39 */ public static H2dRubarBoundaryType DEBIT_39 = new H2dRubarBoundaryType(H2dResource .getS("Débit imposé") + " Group 9", true, 39); /** * rubar =4 */ public static H2dRubarBoundaryType COTE_EAU = new H2dRubarBoundaryType(H2dResource .getS("Cote d'eau imposée"), true, 4); /** * rubar =5 */ public static H2dRubarBoundaryType COTE_EAU_DEBIT_TANGENTIELLE = new H2dRubarBoundaryType( H2dResource.getS("Cote d'eau et débit tangentiel imposés"), true, 5); /** * rubar =6 */ public static H2dRubarBoundaryType TARAGE = new H2dRubarBoundaryType(H2dResource .getS("Loi tarage"), true, 6); /** * rubar =7 */ public static H2dRubarBoundaryType CRITIQUE = new H2dRubarBoundaryType(H2dResource .getS("Régime critique"), true, 7); /** * Type utilise au cas pour caracterise un groupement d'arete ayant des types différents */ public static H2dRubarBoundaryType MIXTE = new H2dRubarBoundaryType(H2dResource .getS("Mixte"), true, -100); /** * */ private H2dRubarBcTypeList() { super(); } } --- NEW FILE: H2dRubarGridAreteSource.java --- /** * @creation 9 juin 2004 * @modification $Date: 2004/06/11 16:32:16 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.rubar; import org.fudaa.dodico.ef.EfGridSource; /** * @author Fred Deniger * @version $Id: H2dRubarGridAreteSource.java,v 1.1 2004/06/11 16:32:16 deniger Exp $ */ public interface H2dRubarGridAreteSource extends EfGridSource{ /** * @return le maillage utilise */ public H2dRubarGrid getRubarGrid(); /** * @return pour chaque element (dans l'ordre du maillage) les elements voisins */ public int[][] elementsVoisinsParElement(); /** * @return pour chaque arete (dans l'ordre de la methode getAretes) les elements voisins */ public int[][] elementsVoisinsParArete(); } --- NEW FILE: H2dRubarParameters.java --- /** * @creation 9 juin 2004 * @modification $Date: 2004/06/11 16:32:16 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.rubar; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.DodicoCommand; import org.fudaa.dodico.commun.DodicoPermanentList; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.dico.DicoParams; import org.fudaa.dodico.h2d.H2dEvolutionManager; import org.fudaa.dodico.h2d.H2dParameters; /** * @author Fred Deniger * @version $Id: H2dRubarParameters.java,v 1.1 2004/06/11 16:32:16 deniger Exp $ */ public class H2dRubarParameters extends H2dParameters { H2dRubarBcMng bcMng_; H2dRubarGrid grid_; H2dRubarProjectDispatcherListener listener_; boolean isModified_; /** * @param _p les parametres de simulation */ private H2dRubarParameters(DicoParams _p) { super(_p); } /** * Permet de reinit l'etat modifie. */ public void clearModifyState() { isModified_ = false; dicoParams_.clearModified(); } /** * @return true si modifie. */ public boolean isModified() { return isModified_ || dicoParams_.isModified(); } /** * @return le maillage */ public H2dRubarGrid getGridVolume() { return grid_; } /** * @param _a les aretes a modifier * @param _t le nouveau type de bord * @return la commande si modif */ public DodicoCommand modifyArete(H2dRubarArete[] _a, final H2dRubarBoundaryType _t) { final Map mem = new HashMap(_a.length); if (modifyArete(_a, _t, mem)) { return new DodicoCommand() { /** * @see org.fudaa.dodico.commun.DodicoCommand#undo() */ public void undo() { for (Iterator it = mem.entrySet().iterator(); it.hasNext();) { Map.Entry e = (Map.Entry) it.next(); ((H2dRubarArete) e.getKey()).initFromMemento((H2dRubarArete) e.getValue()); } isModified_ = true; if (listener_ != null) listener_.areteTypeChanged(); } /** * @see org.fudaa.dodico.commun.DodicoCommand#redo() */ public void redo() { H2dRubarArete[] a = new H2dRubarArete[mem.size()]; mem.keySet().toArray(a); modifyArete(a, _t, null); } }; } return null; } /** * @param _a non null et de taille >0 * @param _t le nouveau bord * @param _mementos * @return true si changement */ protected boolean modifyArete(H2dRubarArete[] _a, H2dRubarBoundaryType _t, Map _mementos) { boolean addMemento = _mementos != null; H2dRubarArete mem = null; boolean r = false; for (int i = _a.length - 1; i >= 0; i--) { if (addMemento) mem = _a[i].createMemento(); if (_a[i].setType(_t)) { r = true; if (addMemento) _mementos.put(_a[i], mem); } } if (r) { isModified_ = true; if (listener_ != null) listener_.areteTypeChanged(); } return r; } /** * @param _s les sources * @param _inter la progression * @param _analyze le receveur des analyses * @return les parametres crées ou nul si erreur fatale */ public static H2dRubarParameters createParameters(H2dRubarGridAreteSource _s, DicoParams _para, ProgressionInterface _inter, DodicoAnalyze _analyze) { if (_s == null) return null; H2dRubarParameters r = new H2dRubarParameters(_para); r.bcMng_ = H2dRubarBcMng.create(_inter, _analyze, _s); r.grid_ = _s.getRubarGrid(); return r; } public DodicoPermanentList getBordList() { return H2dRubarBcTypeList.getList(); } public H2dEvolutionManager getEvolMng() { return null; } /** * @return le manager de bord */ public H2dRubarBcMng getBcMng() { return bcMng_; } public H2dRubarProjectDispatcherListener getListener() { return listener_; } /** * Enleve si necessaire les anciens listeners * * @param _listener le nouveau listener */ public void setListener(H2dRubarProjectDispatcherListener _listener) { if (_listener != listener_) { if (_listener != null) { dicoParams_.removeModelListener(_listener); } dicoParams_.addModelListener(_listener); listener_ = _listener; } } } --- NEW FILE: H2dRubarGrid.java --- /** * @creation 10 juin 2004 * @modification $Date: 2004/06/11 16:32:16 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.rubar; import org.fudaa.dodico.ef.EfElementVolume; import org.fudaa.dodico.ef.EfGridVolume; import org.fudaa.dodico.ef.EfNode; /** * @author Fred Deniger * @version $Id: H2dRubarGrid.java,v 1.1 2004/06/11 16:32:16 deniger Exp $ */ public class H2dRubarGrid extends EfGridVolume { /** * @param _pts * @param _elts * @param _aretes */ public H2dRubarGrid(EfNode[] _pts, EfElementVolume[] _elts, H2dRubarArete[] _aretes) { super(_pts, _elts, _aretes); } /** * @param _idx l'index de l'arete * @return l'arete correspondante */ public H2dRubarArete getRubarArete(int _idx) { return (H2dRubarArete) getArete(_idx); } } --- NEW FILE: H2dRubarProjectDispatcherListener.java --- /** * @creation 11 juin 2004 * @modification $Date: 2004/06/11 16:32:16 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.rubar; import org.fudaa.dodico.dico.DicoParamsListener; /** * @author Fred Deniger * @version $Id: H2dRubarProjectDispatcherListener.java,v 1.1 2004/06/11 16:32:16 deniger Exp $ */ public interface H2dRubarProjectDispatcherListener extends DicoParamsListener{ public void areteTypeChanged(); } --- NEW FILE: H2dRubarBoundaryType.java --- /** * @creation 9 juin 2004 * @modification $Date: 2004/06/11 16:32:16 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.rubar; import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dBoundaryType; /** * @author Fred Deniger * @version $Id: H2dRubarBoundaryType.java,v 1.1 2004/06/11 16:32:16 deniger Exp $ */ public class H2dRubarBoundaryType extends H2dBoundaryType { int rubarIdx_; /** * @param _n le nom du type de bord * @param isSolid true si solide * @param _rubarIdx l'index rubar */ public H2dRubarBoundaryType(String _n, boolean isSolid, int _rubarIdx) { super(_n, isSolid); rubarIdx_ = _rubarIdx; } /** * @param _n le nom du type de bord * @param _rubarIdx l'index rubar */ public H2dRubarBoundaryType(String _n, int _rubarIdx) { this(_n, false, _rubarIdx); } /** * @return l'index rubar */ public int getRubarIdx() { if (rubarIdx_ == H2dRubarBcTypeList.MIXTE.rubarIdx_) { new Throwable().printStackTrace(); } return rubarIdx_; } } --- NEW FILE: H2dRubarBcMng.java --- /** * @creation 9 juin 2004 * @modification $Date: 2004/06/11 16:32:16 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.rubar; import gnu.trove.TIntArrayList; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.ProgressionInterface; /** * @author Fred Deniger * @version $Id: H2dRubarBcMng.java,v 1.1 2004/06/11 16:32:16 deniger Exp $ */ public class H2dRubarBcMng { H2dRubarArete[] externeAretes_; int[] globalIdx_; /** * */ private H2dRubarBcMng() { super(); } public List getUsedBoundaryType() { Set r = new HashSet(15); for (int i = externeAretes_.length - 1; i >= 0; i--) { r.add(externeAretes_[i].getType()); } ArrayList rf = new ArrayList(r); Collections.sort(rf); return rf; } /** * @return le nombre d'arete de bord. */ public int getNbBcArete() { return externeAretes_.length; } public int getGlobalIdx(int _frIdx) { return globalIdx_[_frIdx]; } /** * @param _idx l'indice sur la frontiere * @return l'arete d'indice de bord _idx */ public H2dRubarArete getBcArete(int _idx) { return externeAretes_[_idx]; } /** * @param _in la progression * @param _an l'analyse a remplir * @param _s la source * @return le manager de cl si tout ok. null sinon */ public static H2dRubarBcMng create(ProgressionInterface _in, DodicoAnalyze _an, H2dRubarGridAreteSource _s) { H2dRubarGrid g = _s.getRubarGrid(); int nb = g.getNbAretes(); ArrayList l = new ArrayList(nb / 2); TIntArrayList lidx = new TIntArrayList(nb / 2); H2dRubarArete as; for (int i = 0; i < nb; i++) { as = g.getRubarArete(i); if (as.isExtern()) { l.add(as); lidx.add(i); } } if (_in != null) _in.setProgression(50); H2dRubarBcMng r = new H2dRubarBcMng(); r.externeAretes_ = new H2dRubarArete[l.size()]; l.toArray(r.externeAretes_); r.globalIdx_ = lidx.toNativeArray(); return r; } } |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:32:12
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32225/src/org/fudaa/dodico/h2d/rubar Log Message: Directory /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar added to the repository |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:25:29
|
Update of /cvsroot/fudaa/fudaa_devel/aide/xml/xsl/docsrc/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28035/html Removed Files: param.xml Log Message: trop gros --- param.xml DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:25:28
|
Update of /cvsroot/fudaa/fudaa_devel/aide/xml/xsl/docsrc/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28035/tools Removed Files: profile-chain.png profiling.xml Log Message: trop gros --- profile-chain.png DELETED --- --- profiling.xml DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:25:28
|
Update of /cvsroot/fudaa/fudaa_devel/aide/xml/xsl/docsrc/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28035/template Removed Files: titlepage.xml Log Message: trop gros --- titlepage.xml DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:25:26
|
Update of /cvsroot/fudaa/fudaa_devel/aide/xml/xsl/docsrc/pi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28035/pi Removed Files: pi.xml Log Message: trop gros --- pi.xml DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:25:25
|
Update of /cvsroot/fudaa/fudaa_devel/aide/xml/xsl/docsrc/fo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28035/fo Removed Files: param.xml table.xml Log Message: trop gros --- table.xml DELETED --- --- param.xml DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:25:24
|
Update of /cvsroot/fudaa/fudaa_devel/aide/xml/xsl/docsrc/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28035/common Removed Files: common.xml Log Message: trop gros --- common.xml DELETED --- |
Update of /cvsroot/fudaa/fudaa_devel/aide/xml/xsl/docsrc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28035 Removed Files: clrefentry.xsl copyright.xml doc-link-docbook.xsl docbook-elements.xsl documentation.xml extensions.xml htmlhelp.xml jrefhtml.xsl legalnotice.xml lrefentry.xsl make-xsl-params.pl pirefentry.xsl publishing.xml reference.xml tdg-link.xsl template-example.xml template-example.xsl templates.xml warranty.xml xsl-param-link.xsl xsl-params.xsl xsl2jref.xsl Log Message: trop gros --- xsl-params.xsl DELETED --- --- doc-link-docbook.xsl DELETED --- --- documentation.xml DELETED --- --- extensions.xml DELETED --- --- warranty.xml DELETED --- --- template-example.xml DELETED --- --- lrefentry.xsl DELETED --- --- xsl-param-link.xsl DELETED --- --- template-example.xsl DELETED --- --- jrefhtml.xsl DELETED --- --- clrefentry.xsl DELETED --- --- docbook-elements.xsl DELETED --- --- reference.xml DELETED --- --- pirefentry.xsl DELETED --- --- templates.xml DELETED --- --- make-xsl-params.pl DELETED --- --- htmlhelp.xml DELETED --- --- tdg-link.xsl DELETED --- --- legalnotice.xml DELETED --- --- publishing.xml DELETED --- --- copyright.xml DELETED --- --- xsl2jref.xsl DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:24:35
|
Update of /cvsroot/fudaa/fudaa_devel/aide/xml/xsl/docsrc/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27339/tools Removed Files: ChangeLog Log Message: Trop gros --- ChangeLog DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-11 16:24:34
|
Update of /cvsroot/fudaa/fudaa_devel/aide/xml/xsl/docsrc/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27339/template Removed Files: ChangeLog Log Message: Trop gros --- ChangeLog DELETED --- |
