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
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test In directory sc8-pr-cvs1:/tmp/cvs-serv26610/dodico/src/org/fudaa/dodico/test Modified Files: TestCTableau.java TestCFonctionReel.java TestEdamoxWriter.java TestCPolygone.java TestCVecteurComplexe.java TestEdamoxWriterP2.java TestCSurfaceComposee.java TestHydraulique1dLido.java TestCMatriceReel.java TestClient.java TestCObjet.java TestCTriangle.java TestCVecteurReel.java TestServeur.java TestCProprietePhysique.java TestCSphere.java TestCResultatsMascaret.java TestCMatriceComplexe.java TestCPoint.java TestCParametresMascaret.java TestEdamoxWriterP.java Log Message: *** keyword substitution change *** Index: TestCTableau.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCTableau.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: TestCFonctionReel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCFonctionReel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestEdamoxWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestEdamoxWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestCPolygone.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCPolygone.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: TestCVecteurComplexe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCVecteurComplexe.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestEdamoxWriterP2.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestEdamoxWriterP2.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestCSurfaceComposee.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCSurfaceComposee.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestHydraulique1dLido.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestHydraulique1dLido.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestCMatriceReel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCMatriceReel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestClient.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestClient.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestCObjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCObjet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestCTriangle.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCTriangle.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestCVecteurReel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCVecteurReel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestServeur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestServeur.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestCProprietePhysique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCProprietePhysique.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: TestCSphere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCSphere.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestCResultatsMascaret.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCResultatsMascaret.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestCMatriceComplexe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCMatriceComplexe.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: TestCPoint.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCPoint.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: TestCParametresMascaret.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCParametresMascaret.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: TestEdamoxWriterP.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestEdamoxWriterP.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-03-18 15:36:45
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/geodesie In directory sc8-pr-cvs1:/tmp/cvs-serv26610/dodico/src/org/fudaa/dodico/test/geodesie Modified Files: TestLambert.java TestEllipsoide.java Log Message: *** keyword substitution change *** Index: TestLambert.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/geodesie/TestLambert.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: TestEllipsoide.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/geodesie/TestEllipsoide.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-03-18 15:36:17
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac In directory sc8-pr-cvs1:/tmp/cvs-serv26610/dodico/src/org/fudaa/dodico/test/telemac Modified Files: TestSinusx.java TestSerafin.java Log Message: *** keyword substitution change *** Index: TestSinusx.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestSinusx.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Index: TestSerafin.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestSerafin.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 |
|
From: <de...@us...> - 2003-03-18 15:36:16
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/junit In directory sc8-pr-cvs1:/tmp/cvs-serv26610/dodico/src/org/fudaa/dodico/test/junit Modified Files: DodicoJUnitLauncher.java Log Message: *** keyword substitution change *** Index: DodicoJUnitLauncher.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/junit/DodicoJUnitLauncher.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe In directory sc8-pr-cvs1:/tmp/cvs-serv24399/dodico/src/org/fudaa/dodico/sisyphe Modified Files: ServeurSisyphe.java MainTestPrs.java DParametresSisyphe.java MainTestSOL.java MainTestF.java MainTestCas.java MainTest.java MyBool.java MotsClefs.java MainTestGEO.java MainTestCond.java DCalculSisyphe.java MainTestPre.java DResultatsSisyphe.java Log Message: *** keyword substitution change *** Index: ServeurSisyphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/ServeurSisyphe.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: MainTestPrs.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestPrs.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DParametresSisyphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/DParametresSisyphe.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: MainTestSOL.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestSOL.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: MainTestF.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestF.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: MainTestCas.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestCas.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: MainTest.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: MyBool.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MyBool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: MotsClefs.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MotsClefs.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: MainTestGEO.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestGEO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: MainTestCond.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestCond.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DCalculSisyphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/DCalculSisyphe.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: MainTestPre.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestPre.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DResultatsSisyphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/DResultatsSisyphe.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-03-18 15:29:59
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe
In directory sc8-pr-cvs1:/tmp/cvs-serv23044/dodico/src/org/fudaa/dodico/sisyphe
Modified Files:
DParametresSisyphe.java MotsClefs.java DCalculSisyphe.java
Log Message:
suprression variable inutile
Index: DParametresSisyphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/DParametresSisyphe.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DParametresSisyphe.java 29 Jan 2003 12:14:30 -0000 1.1
--- DParametresSisyphe.java 18 Mar 2003 15:29:55 -0000 1.2
***************
*** 438,482 ****
if(params.esFic.noms.nomfon.length() > 0)
{
! fcas.write(MotsClefs.nomfon + " = " + params.esFic.noms.nomfon + "\n");
}
if(params.esFic.noms.nompre.length() > 0)
{
! fcas.write(MotsClefs.nompre + " = " + params.esFic.noms.nompre + "\n");
}
if(params.esFic.noms.nomprs.length() > 0)
{
! fcas.write(MotsClefs.nomprs + " = " + params.esFic.noms.nomprs + "\n");
}
if(params.esFic.noms.nomref.length() > 0)
{
! fcas.write(MotsClefs.nomref + " = " + params.esFic.noms.nomref + "\n");
}
if(params.esFic.noms.nomgeo.length() > 0)
{
! fcas.write(MotsClefs.nomgeo + " = " + params.esFic.noms.nomgeo + "\n");
}
if(params.esFic.noms.nomf.length() > 0)
{
! fcas.write(MotsClefs.nomf + " = " + params.esFic.noms.nomf + "\n");
}
if(params.esFic.noms.nomcas.length() > 0)
{
! fcas.write(MotsClefs.nomcas + " = " + params.esFic.noms.nomcas + "\n");
}
if(params.esFic.noms.nomcond.length() > 0)
{
! fcas.write(MotsClefs.nomcond + " = " + params.esFic.noms.nomcond + "\n");
}
if(params.esFic.noms.nomsol.length() > 0)
{
! fcas.write(MotsClefs.nomsol + " = " + params.esFic.noms.nomsol + "\n");
}
System.out.println("STANDARD");
! fcas.write(MotsClefs.bingeo + " = " + params.esFic.std.bingeo + "\n");
! fcas.write(MotsClefs.binpre + " = " + params.esFic.std.binpre + "\n");
! fcas.write(MotsClefs.binprs + " = " + params.esFic.std.binprs + "\n");
! fcas.write(MotsClefs.binres + " = " + params.esFic.std.binres + "\n");
! fcas.write(MotsClefs.binref + " = " + params.esFic.std.binref + "\n");
System.out.println("***E/S,Generalites");
--- 438,482 ----
if(params.esFic.noms.nomfon.length() > 0)
{
! fcas.println(MotsClefs.nomfon + " = " + params.esFic.noms.nomfon);
}
if(params.esFic.noms.nompre.length() > 0)
{
! fcas.println(MotsClefs.nompre + " = " + params.esFic.noms.nompre);
}
if(params.esFic.noms.nomprs.length() > 0)
{
! fcas.println(MotsClefs.nomprs + " = " + params.esFic.noms.nomprs);
}
if(params.esFic.noms.nomref.length() > 0)
{
! fcas.println(MotsClefs.nomref + " = " + params.esFic.noms.nomref);
}
if(params.esFic.noms.nomgeo.length() > 0)
{
! fcas.println(MotsClefs.nomgeo + " = " + params.esFic.noms.nomgeo);
}
if(params.esFic.noms.nomf.length() > 0)
{
! fcas.println(MotsClefs.nomf + " = " + params.esFic.noms.nomf);
}
if(params.esFic.noms.nomcas.length() > 0)
{
! fcas.println(MotsClefs.nomcas + " = " + params.esFic.noms.nomcas);
}
if(params.esFic.noms.nomcond.length() > 0)
{
! fcas.println(MotsClefs.nomcond + " = " + params.esFic.noms.nomcond);
}
if(params.esFic.noms.nomsol.length() > 0)
{
! fcas.println(MotsClefs.nomsol + " = " + params.esFic.noms.nomsol);
}
System.out.println("STANDARD");
! fcas.println(MotsClefs.bingeo + " = " + params.esFic.std.bingeo);
! fcas.println(MotsClefs.binpre + " = " + params.esFic.std.binpre);
! fcas.println(MotsClefs.binprs + " = " + params.esFic.std.binprs);
! fcas.println(MotsClefs.binres + " = " + params.esFic.std.binres);
! fcas.println(MotsClefs.binref + " = " + params.esFic.std.binref);
System.out.println("***E/S,Generalites");
***************
*** 484,574 ****
if(params.esGen.calcul.titca.length() > 0)
{
! fcas.write(MotsClefs.titca + " = " + params.esGen.calcul.titca + "\n");
}
! fcas.write(MotsClefs.numver + " = " + params.esGen.calcul.numver + "\n");
! fcas.write(MotsClefs.bibli + " = " + params.esGen.calcul.bibli + "\n");
! fcas.write(MotsClefs.perma + " = " + new Boolean(params.esGen.calcul.perma).toString().toUpperCase() + "\n");
! fcas.write(MotsClefs.valid + " = " + new Boolean(params.esGen.calcul.valid).toString().toUpperCase() + "\n");
! fcas.write(MotsClefs.pdtvar + " = " + new Boolean(params.esGen.calcul.pdtvar).toString().toUpperCase() + "\n");
System.out.println("ENVIRONNEMENT");
if(params.esGen.env.ucray.length() > 0)
{
! fcas.write(MotsClefs.ucray + " = " + params.esGen.env.ucray + "\n");
}
! fcas.write(MotsClefs.tmcray + " = " + params.esGen.env.tmcray + "\n");
if(params.esGen.env.pwdcray.length() > 0)
{
! fcas.write(MotsClefs.pwdcray + " = " + params.esGen.env.pwdcray + "\n");
}
! fcas.write(MotsClefs.memcray + " = " + params.esGen.env.memcray + "\n");
System.out.println("TYPE DU LOGICIEL DE DESSIN");
! fcas.write(MotsClefs.logdes + " = " + params.esGen.logiDes.logdes + "\n");
! fcas.write(MotsClefs.logpre + " = " + params.esGen.logiDes.logpre + "\n");
System.out.println("HYDRODYNAMIQUE");
! fcas.write(MotsClefs.hydro + " = " + params.esGen.hydro + "\n");
System.out.println("TYPE DU MAILLEUR");
! fcas.write(MotsClefs.mailleur + " = " + params.esGen.mailleur + "\n");
System.out.println("***E/S,Graphiques et Listing");
! fcas.write(MotsClefs.sortis + " = " + params.esGrLst.sortis + "\n");
if(params.esGrLst.varim.length() > 0)
{
! fcas.write(MotsClefs.varim + " = " + params.esGrLst.varim + "\n");
}
! fcas.write(MotsClefs.bilma + " = " + new Boolean(params.esGrLst.bilma).toString().toUpperCase() + "\n");
! fcas.write(MotsClefs.leopr + " = " + params.esGrLst.leopr + "\n");
! fcas.write(MotsClefs.lispr + " = " + params.esGrLst.lispr + "\n");
System.out.println("***Parametres Numeriques");
System.out.println("GENERAL");
! fcas.write(MotsClefs.bandec + " = " + new Boolean(params.paramNum.general.bandec).toString().toUpperCase() + "\n");
! fcas.write(MotsClefs.calmeth + " = " + params.paramNum.general.calmeth + "\n");
! fcas.write(MotsClefs.n1 + " = " + params.paramNum.general.n1 + "\n");
! fcas.write(MotsClefs.optban + " = " + params.paramNum.general.optban + "\n");
! fcas.write(MotsClefs.lvect + " = " + params.paramNum.general.lvect + "\n");
! fcas.write(MotsClefs.zero + " = " + params.paramNum.general.zero + "\n");
! fcas.write(MotsClefs.teta + " = " + params.paramNum.general.teta + "\n");
! fcas.write(MotsClefs.beta + " = " + params.paramNum.general.beta + "\n");
System.out.println("DUREE DU CALCUL");
! fcas.write(MotsClefs.delt + " = " + params.paramNum.dureeCalc.delt + "\n");
! fcas.write(MotsClefs.orghydro + " = " + params.paramNum.dureeCalc.orghydro + "\n");
! fcas.write(MotsClefs.pmaree + " = " + params.paramNum.dureeCalc.pmaree + "\n");
! fcas.write(MotsClefs.npas + " = " + params.paramNum.dureeCalc.npas + "\n");
! fcas.write(MotsClefs.nmarees + " = " + params.paramNum.dureeCalc.nmarees + "\n");
! fcas.write(MotsClefs.nsous + " = " + params.paramNum.dureeCalc.nsous + "\n");
System.out.println("***Solveur");
! fcas.write(MotsClefs.lump + " = " + new Boolean(params.solveur.lump).toString().toUpperCase() + "\n");
! fcas.write(MotsClefs.solveur + " = " + params.solveur.solveur + "\n");
! fcas.write(MotsClefs.optsolv + " = " + params.solveur.optsolv + "\n");
! fcas.write(MotsClefs.precon + " = " + params.solveur.precon + "\n");
! fcas.write(MotsClefs.maxit + " = " + params.solveur.maxit + "\n");
! fcas.write(MotsClefs.psolveur + " = " + params.solveur.psolveur + "\n");
System.out.println("***Vitesse Celerite Hauteur");
! fcas.write(MotsClefs.hmin + " = " + params.hmin + "\n");
System.out.println("***Equations");
System.out.println("FROTTEMENT ET LISSAGE");
! fcas.write(MotsClefs.sfon + " = " + params.sfon + "\n");
System.out.println("***Transport Solide");
! fcas.write(MotsClefs.icf + " = " + params.transSol.icf + "\n");
! fcas.write(MotsClefs.rc + " = " + params.transSol.rc + "\n");
! fcas.write(MotsClefs.dm + " = " + params.transSol.dm + "\n");
! fcas.write(MotsClefs.ac + " = " + params.transSol.ac + "\n");
! fcas.write(MotsClefs.xkv + " = " + params.transSol.xkv + "\n");
! fcas.write(MotsClefs.optfond + " = " + params.transSol.optfond + "\n");
System.out.println("***Constantes Physiques");
! fcas.write(MotsClefs.xmve + " = " + params.consPhys.xmve + "\n");
! fcas.write(MotsClefs.xmvs + " = " + params.consPhys.xmvs + "\n");
! fcas.write(MotsClefs.grav + " = " + params.consPhys.grav + "\n");
! fcas.write(MotsClefs.vce + " = " + params.consPhys.vce + "\n");
fcas.close();
--- 484,574 ----
if(params.esGen.calcul.titca.length() > 0)
{
! fcas.println(MotsClefs.titca + " = " + params.esGen.calcul.titca);
}
! fcas.println(MotsClefs.numver + " = " + params.esGen.calcul.numver);
! fcas.println(MotsClefs.bibli + " = " + params.esGen.calcul.bibli );
! fcas.println(MotsClefs.perma + " = " + new Boolean(params.esGen.calcul.perma).toString().toUpperCase() );
! fcas.println(MotsClefs.valid + " = " + new Boolean(params.esGen.calcul.valid).toString().toUpperCase() );
! fcas.println(MotsClefs.pdtvar + " = " + new Boolean(params.esGen.calcul.pdtvar).toString().toUpperCase() );
System.out.println("ENVIRONNEMENT");
if(params.esGen.env.ucray.length() > 0)
{
! fcas.println(MotsClefs.ucray + " = " + params.esGen.env.ucray );
}
! fcas.println(MotsClefs.tmcray + " = " + params.esGen.env.tmcray );
if(params.esGen.env.pwdcray.length() > 0)
{
! fcas.println(MotsClefs.pwdcray + " = " + params.esGen.env.pwdcray );
}
! fcas.println(MotsClefs.memcray + " = " + params.esGen.env.memcray );
System.out.println("TYPE DU LOGICIEL DE DESSIN");
! fcas.println(MotsClefs.logdes + " = " + params.esGen.logiDes.logdes );
! fcas.println(MotsClefs.logpre + " = " + params.esGen.logiDes.logpre );
System.out.println("HYDRODYNAMIQUE");
! fcas.println(MotsClefs.hydro + " = " + params.esGen.hydro );
System.out.println("TYPE DU MAILLEUR");
! fcas.println(MotsClefs.mailleur + " = " + params.esGen.mailleur );
System.out.println("***E/S,Graphiques et Listing");
! fcas.println(MotsClefs.sortis + " = " + params.esGrLst.sortis );
if(params.esGrLst.varim.length() > 0)
{
! fcas.println(MotsClefs.varim + " = " + params.esGrLst.varim );
}
! fcas.println(MotsClefs.bilma + " = " + new Boolean(params.esGrLst.bilma).toString().toUpperCase() );
! fcas.println(MotsClefs.leopr + " = " + params.esGrLst.leopr );
! fcas.println(MotsClefs.lispr + " = " + params.esGrLst.lispr );
System.out.println("***Parametres Numeriques");
System.out.println("GENERAL");
! fcas.println(MotsClefs.bandec + " = " + new Boolean(params.paramNum.general.bandec).toString().toUpperCase() );
! fcas.println(MotsClefs.calmeth + " = " + params.paramNum.general.calmeth );
! fcas.println(MotsClefs.n1 + " = " + params.paramNum.general.n1 );
! fcas.println(MotsClefs.optban + " = " + params.paramNum.general.optban );
! fcas.println(MotsClefs.lvect + " = " + params.paramNum.general.lvect );
! fcas.println(MotsClefs.zero + " = " + params.paramNum.general.zero );
! fcas.println(MotsClefs.teta + " = " + params.paramNum.general.teta );
! fcas.println(MotsClefs.beta + " = " + params.paramNum.general.beta );
System.out.println("DUREE DU CALCUL");
! fcas.println(MotsClefs.delt + " = " + params.paramNum.dureeCalc.delt );
! fcas.println(MotsClefs.orghydro + " = " + params.paramNum.dureeCalc.orghydro );
! fcas.println(MotsClefs.pmaree + " = " + params.paramNum.dureeCalc.pmaree );
! fcas.println(MotsClefs.npas + " = " + params.paramNum.dureeCalc.npas );
! fcas.println(MotsClefs.nmarees + " = " + params.paramNum.dureeCalc.nmarees );
! fcas.println(MotsClefs.nsous + " = " + params.paramNum.dureeCalc.nsous );
System.out.println("***Solveur");
! fcas.println(MotsClefs.lump + " = " + new Boolean(params.solveur.lump).toString().toUpperCase() );
! fcas.println(MotsClefs.solveur + " = " + params.solveur.solveur );
! fcas.println(MotsClefs.optsolv + " = " + params.solveur.optsolv );
! fcas.println(MotsClefs.precon + " = " + params.solveur.precon );
! fcas.println(MotsClefs.maxit + " = " + params.solveur.maxit );
! fcas.println(MotsClefs.psolveur + " = " + params.solveur.psolveur );
System.out.println("***Vitesse Celerite Hauteur");
! fcas.println(MotsClefs.hmin + " = " + params.hmin );
System.out.println("***Equations");
System.out.println("FROTTEMENT ET LISSAGE");
! fcas.println(MotsClefs.sfon + " = " + params.sfon );
System.out.println("***Transport Solide");
! fcas.println(MotsClefs.icf + " = " + params.transSol.icf );
! fcas.println(MotsClefs.rc + " = " + params.transSol.rc );
! fcas.println(MotsClefs.dm + " = " + params.transSol.dm );
! fcas.println(MotsClefs.ac + " = " + params.transSol.ac );
! fcas.println(MotsClefs.xkv + " = " + params.transSol.xkv );
! fcas.println(MotsClefs.optfond + " = " + params.transSol.optfond );
System.out.println("***Constantes Physiques");
! fcas.println(MotsClefs.xmve + " = " + params.consPhys.xmve );
! fcas.println(MotsClefs.xmvs + " = " + params.consPhys.xmvs );
! fcas.println(MotsClefs.grav + " = " + params.consPhys.grav );
! fcas.println(MotsClefs.vce + " = " + params.consPhys.vce );
fcas.close();
***************
*** 583,586 ****
--- 583,589 ----
}
+
+ public static String emptyString()
+ { return "";}
***************
*** 612,636 ****
{
// E/S, Fichiers: NOMS
! params.esFic.noms.nomfon = new String();
! params.esFic.noms.nompre = new String();
! params.esFic.noms.nomprs = new String();
! params.esFic.noms.nomref = new String();
! params.esFic.noms.nomgeo = new String();
! params.esFic.noms.nomf = new String();
! params.esFic.noms.nomcas = new String();
! params.esFic.noms.nomcond = new String();
! params.esFic.noms.nomsol = new String();
// STANDARD
! params.esFic.std.bingeo = new String("STD");
! params.esFic.std.binpre = new String("STD");
! params.esFic.std.binprs = new String("STD");
! params.esFic.std.binres = new String("STD");
! params.esFic.std.binref = new String("STD");
// E/S,Generalites CALCUL
! params.esGen.calcul.titca = new String();
! params.esGen.calcul.numver = new String("V1P1,V4P0,V4P0,V4P0,V4P0");
! params.esGen.calcul.bibli = new String("SISYPHE,UTIL,DAMO,BIEF,HP");
params.esGen.calcul.perma = false;
params.esGen.calcul.valid = false;
--- 615,640 ----
{
// E/S, Fichiers: NOMS
! params.esFic.noms.nomfon = emptyString();
! params.esFic.noms.nompre = emptyString();
! params.esFic.noms.nomprs = emptyString();
! params.esFic.noms.nomref = emptyString();
! params.esFic.noms.nomgeo = emptyString();
! params.esFic.noms.nomf = emptyString();
! params.esFic.noms.nomcas = emptyString();
! params.esFic.noms.nomcond = emptyString();
! params.esFic.noms.nomsol = emptyString();
// STANDARD
! String STD="STD";
! params.esFic.std.bingeo = STD;
! params.esFic.std.binpre = STD;
! params.esFic.std.binprs = STD;
! params.esFic.std.binres = STD;
! params.esFic.std.binref = STD;
// E/S,Generalites CALCUL
! params.esGen.calcul.titca = emptyString();
! params.esGen.calcul.numver = "V1P1,V4P0,V4P0,V4P0,V4P0";
! params.esGen.calcul.bibli = "SISYPHE,UTIL,DAMO,BIEF,HP";
params.esGen.calcul.perma = false;
params.esGen.calcul.valid = false;
***************
*** 638,645 ****
// ENVIRONNEMENT
! params.esGen.env.ucray = new String("");
! params.esGen.env.tmcray = new String("10");
! params.esGen.env.pwdcray = new String("");
! params.esGen.env.memcray = new String("1500000W");
//TYPE DU LOGICIEL DE DESSIN
--- 642,649 ----
// ENVIRONNEMENT
! params.esGen.env.ucray = emptyString();
! params.esGen.env.tmcray = "10";
! params.esGen.env.pwdcray = emptyString();
! params.esGen.env.memcray = "1500000W";
//TYPE DU LOGICIEL DE DESSIN
***************
*** 654,659 ****
//E/S,Graphiques et Listing
! params.esGrLst.sortis = new String("U,V,S,E,H,B");
! params.esGrLst.varim = new String();
params.esGrLst.bilma = false;
params.esGrLst.leopr = 1;
--- 658,663 ----
//E/S,Graphiques et Listing
! params.esGrLst.sortis = "U,V,S,E,H,B";
! params.esGrLst.varim = emptyString();
params.esGrLst.bilma = false;
params.esGrLst.leopr = 1;
***************
*** 732,740 ****
FortranReader fcas = new FortranReader(new FileReader(fichier));
boolean NOEOF = true;
! String ligne = new String();
! String MotClef = new String();
! String Affectation = new String();
int iAffectation;
- int icmd = 0;
if(fcas.ready())
{
--- 736,743 ----
FortranReader fcas = new FortranReader(new FileReader(fichier));
boolean NOEOF = true;
! String ligne = emptyString();
! String MotClef = emptyString();
! String Affectation = emptyString();
int iAffectation;
if(fcas.ready())
{
***************
*** 1386,1390 ****
SParametresSisypheGEO params = new SParametresSisypheGEO();
! params.titre = new String();
params.NBV = new int[0];
params.descVariables = new String[0];
--- 1389,1393 ----
SParametresSisypheGEO params = new SParametresSisypheGEO();
! params.titre = emptyString();
params.NBV = new int[0];
params.descVariables = new String[0];
***************
*** 1607,1611 ****
SParametresSisypheF params = new SParametresSisypheF();
! params.code = new String();
try
--- 1610,1614 ----
SParametresSisypheF params = new SParametresSisypheF();
! params.code = emptyString();
try
***************
*** 1702,1706 ****
SParametresSisypheREF params = new SParametresSisypheREF();
! params.reference = new String();
try
--- 1705,1709 ----
SParametresSisypheREF params = new SParametresSisypheREF();
! params.reference = emptyString();
try
***************
*** 1773,1777 ****
// FortranBinaryInputStream fpre=new FortranBinaryInputStream(new FileInputStream(fichier+".pre"), true);
FortranBinaryInputStream fpre = new FortranBinaryInputStream(new FileInputStream(fichier), true);
! params.titre = new String();
params.NBV = new int[2];
params.valeurs = new SParametresVarsBlocSisypheGEO[0];
--- 1776,1780 ----
// FortranBinaryInputStream fpre=new FortranBinaryInputStream(new FileInputStream(fichier+".pre"), true);
FortranBinaryInputStream fpre = new FortranBinaryInputStream(new FileInputStream(fichier), true);
! params.titre = emptyString();
params.NBV = new int[2];
params.valeurs = new SParametresVarsBlocSisypheGEO[0];
Index: MotsClefs.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MotsClefs.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MotsClefs.java 29 Jan 2003 12:14:30 -0000 1.1
--- MotsClefs.java 18 Mar 2003 15:29:56 -0000 1.2
***************
*** 91,351 ****
* ....
*/
! public static String ac = new String("PARAMETRE DE SHIELDS");
/**
* ....
*/
! public static String bandec = new String("BANCS DECOUVRANTS");
/**
* ....
*/
! public static String beta = new String("BETA");
/**
* ....
*/
! public static String bibli = new String("BIBLIOTHEQUES");
/**
* ....
*/
! public static String bilma = new String("BILAN DE MASSE");
/**
* ....
*/
! public static String bingeo = new String("STANDARD DU FICHIER DE GEOMETRIE");
/**
* ....
*/
! public static String binpre = new String("STANDARD DU FICHIER PRECEDENT");
/**
* ....
*/
! public static String binprs = new String("STANDARD DU FICHIER PRECEDENT SEDIMENTOLOGIQUE");
/**
* ....
*/
! public static String binres = new String("STANDARD DU FICHIER DE REFERENCE");
/**
* ....
*/
! public static String binref = new String("STANDARD DU FICHIER RESULTAT");
/**
* ....
*/
! public static String calmeth = new String("METHODE DE CALCUL");
/**
* ....
*/
! public static String delt = new String("PAS DE TEMPS");
/**
* ....
*/
! public static String dm = new String("DIAMETRE MOYEN DES GRAINS");
/**
* ....
*/
! public static String grav = new String("GRAVITE");
/**
* ....
*/
! public static String hmin = new String("VALEUR MINIMUM DE H");
/**
* ....
*/
! public static String hydro = new String("CODE DE CALCUL UTILISE POUR L'HYDRODYNAMIQUE");
/**
* ....
*/
! public static String icf = new String("FORMULE DE TRANSPORT SOLIDE");
/**
* ....
*/
! public static String leopr = new String("PERIODE DE SORTIE GRAPHIQUE");
/**
* ....
*/
! public static String lispr = new String("PERIODE DE SORTIE LISTING");
/**
* ....
*/
! public static String logdes = new String("LOGICIEL DE DESSIN");
/**
* ....
*/
! public static String logpre = new String("LOGICIEL DE DESSIN DU CALCUL PRECEDENT");
/**
* ....
*/
! public static String lump = new String("MASS-LUMPING");
/**
* ....
*/
! public static String lvect = new String("LONGUEUR DU VECTEUR");
/**
* ....
*/
! public static String mailleur = new String("MAILLEUR");
/**
* ....
*/
! public static String maxit = new String("MAXIMUM D'ITERATIONS POUR LE SOLVEUR");
/**
* ....
*/
! public static String memcray = new String("PLACE MEMOIRE CRAY");
/**
* ....
*/
! public static String n1 = new String("COEFFICIENT DE FILTRAGE");
/**
* ....
*/
! public static String nmarees = new String("NOMBRE DE MAREES OU CRUES");
/**
* ....
*/
! public static String nomcas = new String("FICHIER DES PARAMETRES");
/**
* ....
*/
! public static String nomcond = new String("FICHIER DES CONDITIONS AUX LIMITES");
/**
* ....
*/
! public static String nomf = new String("FICHIER FORTRAN");
/**
* ....
*/
! public static String nomfon = new String("FICHIER DES FONDS");
/**
* ....
*/
! public static String nomgeo = new String("FICHIER DE GEOMETRIE");
/**
* ....
*/
! public static String nompre = new String("FICHIER DU CALCUL PRECEDENT");
/**
* ....
*/
! public static String nomprs = new String("FICHIER PRECEDENT SEDIMENTOLOGIQUE");
/**
* ....
*/
! public static String nomref = new String("FICHIER DE REFERENCE");
/**
* ....
*/
! public static String nomsol = new String("FICHIER DES RESULTATS");
/**
* ....
*/
! public static String npas = new String("NOMBRE DE PAS DE TEMPS");
/**
* ....
*/
! public static String nsous = new String("NOMBRE DE SOUS-ITERATIONS");
/**
* ....
*/
! public static String numver = new String("NUMERO DE VERSION");
/**
* ....
*/
! public static String optban = new String("OPTION DE TRAITEMENT DES BANCS DECOUVRANTS");
/**
* ....
*/
! public static String optfond = new String("OPTION DE TRAITEMENT DES FONDS NON ERODABLES");
/**
* ....
*/
! public static String optsolv = new String("OPTION DU SOLVEUR");
/**
* ....
*/
! public static String orghydro = new String("TEMPS D'ORIGINE DE L'HYDROGRAMME");
/**
* ....
*/
! public static String pdtvar = new String("PAS DE TEMPS VARIABLE");
/**
* ....
*/
! public static String perma = new String("CAS PERMANENT");
/**
* ....
*/
! public static String pmaree = new String("PERIODE DE LA MAREE");
/**
* ....
*/
! public static String precon = new String("PRECONDITIONNEMENT");
/**
* ....
*/
! public static String psolveur = new String("PRECISION DU SOLVEUR");
/**
* ....
*/
! public static String pwdcray = new String("MOT DE PASSE CRAY");
/**
* ....
*/
! public static String rc = new String("RAPPORT D'EVOLUTION CRITIQUE");
/**
* ....
*/
! public static String sfon = new String("COEFFICIENT DE FROTTEMENT");
/**
* ....
*/
! public static String sortis = new String("VARIABLES POUR LES SORTIES GRAPHIQUES");
/**
* ....
*/
! public static String solveur = new String("SOLVEUR");
/**
* ....
*/
! public static String teta = new String("TETA");
/**
* ....
*/
! public static String titca = new String("TITRE");
/**
* ....
*/
! public static String tmcray = new String("TEMPS MACHINE CRAY");
/**
* ....
*/
! public static String ucray = new String("USER CRAY");
/**
* ....
*/
! public static String valid = new String("VALIDATION");
/**
* ....
*/
! public static String varim = new String("VARIABLES A IMPRIMER");
/**
* ....
*/
! public static String vce = new String("VISCOSITE CINEMATIQUE EAU");
/**
* ....
*/
! public static String xkv = new String("COEFFICIENT FONCTION DE LA POROSITE");
/**
* ....
*/
! public static String xmve = new String("MASSE VOLUMIQUE EAU");
/**
* ....
*/
! public static String xmvs = new String("MASSE VOLUMIQUE SEDIMENT");
/**
* ....
*/
! public static String zero = new String("ZERO");
}
--- 91,351 ----
* ....
*/
! public static String ac = "PARAMETRE DE SHIELDS";
/**
* ....
*/
! public static String bandec = "BANCS DECOUVRANTS";
/**
* ....
*/
! public static String beta = "BETA";
/**
* ....
*/
! public static String bibli = "BIBLIOTHEQUES";
/**
* ....
*/
! public static String bilma = "BILAN DE MASSE";
/**
* ....
*/
! public static String bingeo = "STANDARD DU FICHIER DE GEOMETRIE";
/**
* ....
*/
! public static String binpre = "STANDARD DU FICHIER PRECEDENT";
/**
* ....
*/
! public static String binprs = "STANDARD DU FICHIER PRECEDENT SEDIMENTOLOGIQUE";
/**
* ....
*/
! public static String binres = "STANDARD DU FICHIER DE REFERENCE";
/**
* ....
*/
! public static String binref = "STANDARD DU FICHIER RESULTAT";
/**
* ....
*/
! public static String calmeth = "METHODE DE CALCUL";
/**
* ....
*/
! public static String delt = "PAS DE TEMPS";
/**
* ....
*/
! public static String dm = "DIAMETRE MOYEN DES GRAINS";
/**
* ....
*/
! public static String grav = "GRAVITE";
/**
* ....
*/
! public static String hmin = "VALEUR MINIMUM DE H";
/**
* ....
*/
! public static String hydro = "CODE DE CALCUL UTILISE POUR L'HYDRODYNAMIQUE";
/**
* ....
*/
! public static String icf = "FORMULE DE TRANSPORT SOLIDE";
/**
* ....
*/
! public static String leopr = "PERIODE DE SORTIE GRAPHIQUE";
/**
* ....
*/
! public static String lispr = "PERIODE DE SORTIE LISTING";
/**
* ....
*/
! public static String logdes = "LOGICIEL DE DESSIN";
/**
* ....
*/
! public static String logpre = "LOGICIEL DE DESSIN DU CALCUL PRECEDENT";
/**
* ....
*/
! public static String lump = "MASS-LUMPING";
/**
* ....
*/
! public static String lvect = "LONGUEUR DU VECTEUR";
/**
* ....
*/
! public static String mailleur = "MAILLEUR";
/**
* ....
*/
! public static String maxit = "MAXIMUM D'ITERATIONS POUR LE SOLVEUR";
/**
* ....
*/
! public static String memcray ="PLACE MEMOIRE CRAY";
/**
* ....
*/
! public static String n1 ="COEFFICIENT DE FILTRAGE";
/**
* ....
*/
! public static String nmarees ="NOMBRE DE MAREES OU CRUES";
/**
* ....
*/
! public static String nomcas ="FICHIER DES PARAMETRES";
/**
* ....
*/
! public static String nomcond ="FICHIER DES CONDITIONS AUX LIMITES";
/**
* ....
*/
! public static String nomf ="FICHIER FORTRAN";
/**
* ....
*/
! public static String nomfon ="FICHIER DES FONDS";
/**
* ....
*/
! public static String nomgeo ="FICHIER DE GEOMETRIE";
/**
* ....
*/
! public static String nompre ="FICHIER DU CALCUL PRECEDENT";
/**
* ....
*/
! public static String nomprs ="FICHIER PRECEDENT SEDIMENTOLOGIQUE";
/**
* ....
*/
! public static String nomref ="FICHIER DE REFERENCE";
/**
* ....
*/
! public static String nomsol ="FICHIER DES RESULTATS";
/**
* ....
*/
! public static String npas ="NOMBRE DE PAS DE TEMPS";
/**
* ....
*/
! public static String nsous ="NOMBRE DE SOUS-ITERATIONS";
/**
* ....
*/
! public static String numver ="NUMERO DE VERSION";
/**
* ....
*/
! public static String optban ="OPTION DE TRAITEMENT DES BANCS DECOUVRANTS";
/**
* ....
*/
! public static String optfond ="OPTION DE TRAITEMENT DES FONDS NON ERODABLES";
/**
* ....
*/
! public static String optsolv ="OPTION DU SOLVEUR";
/**
* ....
*/
! public static String orghydro ="TEMPS D'ORIGINE DE L'HYDROGRAMME";
/**
* ....
*/
! public static String pdtvar ="PAS DE TEMPS VARIABLE";
/**
* ....
*/
! public static String perma ="CAS PERMANENT";
/**
* ....
*/
! public static String pmaree ="PERIODE DE LA MAREE";
/**
* ....
*/
! public static String precon ="PRECONDITIONNEMENT";
/**
* ....
*/
! public static String psolveur ="PRECISION DU SOLVEUR";
/**
* ....
*/
! public static String pwdcray ="MOT DE PASSE CRAY";
/**
* ....
*/
! public static String rc ="RAPPORT D'EVOLUTION CRITIQUE";
/**
* ....
*/
! public static String sfon ="COEFFICIENT DE FROTTEMENT";
/**
* ....
*/
! public static String sortis ="VARIABLES POUR LES SORTIES GRAPHIQUES";
/**
* ....
*/
! public static String solveur ="SOLVEUR";
/**
* ....
*/
! public static String teta ="TETA";
/**
* ....
*/
! public static String titca ="TITRE";
/**
* ....
*/
! public static String tmcray ="TEMPS MACHINE CRAY";
/**
* ....
*/
! public static String ucray ="USER CRAY";
/**
* ....
*/
! public static String valid ="VALIDATION";
/**
* ....
*/
! public static String varim ="VARIABLES A IMPRIMER";
/**
* ....
*/
! public static String vce ="VISCOSITE CINEMATIQUE EAU";
/**
* ....
*/
! public static String xkv ="COEFFICIENT FONCTION DE LA POROSITE";
/**
* ....
*/
! public static String xmve ="MASSE VOLUMIQUE EAU";
/**
* ....
*/
! public static String xmvs ="MASSE VOLUMIQUE SEDIMENT";
/**
* ....
*/
! public static String zero ="ZERO";
}
Index: DCalculSisyphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/DCalculSisyphe.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DCalculSisyphe.java 29 Jan 2003 12:14:30 -0000 1.1
--- DCalculSisyphe.java 18 Mar 2003 15:29:56 -0000 1.2
***************
*** 110,119 ****
String path = cheminServeur();
log(c, "lancement du calcul");
! String nomCOND = new String(path + params.parametresSisypheCAS().esFic.noms.nomcond);
! String nomCAS = new String(path + params.parametresSisypheCAS().esFic.noms.nomcas);
! String nomF = new String(path + params.parametresSisypheCAS().esFic.noms.nomf);
! String nomGEO = new String(path + params.parametresSisypheCAS().esFic.noms.nomgeo);
! String nomREF = new String(path + params.parametresSisypheCAS().esFic.noms.nomref);
! String nomSOL = new String(path + params.parametresSisypheCAS().esFic.noms.nomsol);
File fCOND = new File(nomCOND);
File fCAS = new File(nomCAS);
--- 110,119 ----
String path = cheminServeur();
log(c, "lancement du calcul");
! String nomCOND = path + params.parametresSisypheCAS().esFic.noms.nomcond;
! String nomCAS = path + params.parametresSisypheCAS().esFic.noms.nomcas;
! String nomF = path + params.parametresSisypheCAS().esFic.noms.nomf;
! String nomGEO = path + params.parametresSisypheCAS().esFic.noms.nomgeo;
! String nomREF = path + params.parametresSisypheCAS().esFic.noms.nomref;
! String nomSOL = path + params.parametresSisypheCAS().esFic.noms.nomsol;
File fCOND = new File(nomCOND);
File fCAS = new File(nomCAS);
***************
*** 164,168 ****
{
cmd = new String[2];
! cmd[0] = new String(path + "sisyphe-win.bat");
cmd[1] = path;
}
--- 164,168 ----
{
cmd = new String[2];
! cmd[0] = path + "sisyphe-win.bat";
cmd[1] = path;
}
***************
*** 170,174 ****
{
cmd = new String[2];
! cmd[0] = new String(path + "sisyphe.sh");
cmd[1] = path;
}
--- 170,174 ----
{
cmd = new String[2];
! cmd[0] = path + "sisyphe.sh";
cmd[1] = path;
}
|
|
From: <de...@us...> - 2003-03-18 15:27:52
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor
In directory sc8-pr-cvs1:/tmp/cvs-serv22078/dodico/src/org/fudaa/dodico/sipor
Modified Files:
DCalculSipor.java DParametresSipor.java
Log Message:
suprression variable inutile
Index: DCalculSipor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor/DCalculSipor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DCalculSipor.java 29 Jan 2003 12:14:38 -0000 1.1
--- DCalculSipor.java 18 Mar 2003 15:27:48 -0000 1.2
***************
*** 72,76 ****
String os=System.getProperty("os.name");
- String drive;
String path=cheminServeur();
String fichier ="sipor"+c.numero();
--- 72,75 ----
Index: DParametresSipor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor/DParametresSipor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DParametresSipor.java 29 Jan 2003 12:14:38 -0000 1.1
--- DParametresSipor.java 18 Mar 2003 15:27:49 -0000 1.2
***************
*** 823,831 ****
int[] fmt = {80, 101};
int i;
- int j;
- int k;
- int l;
- int nb;
-
String[] rs_membre2 = {"Entrée perturbateur", "Sortie perturbateur", "Entrée bassin 1", "Sortie bassin 1",
"Entrée bassin 2", "Sortie bassin 2", "Entrée bassin 3", "Sortie bassin 3"};
--- 823,826 ----
|
|
From: <de...@us...> - 2003-03-18 15:26:06
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac
In directory sc8-pr-cvs1:/tmp/cvs-serv20992/dodico/src/org/fudaa/dodico/taucomac
Modified Files:
DParametresTaucomac.java DResultatsTaucomac.java
DCalculTaucomac.java
Log Message:
suprression variable inutile
Index: DParametresTaucomac.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac/DParametresTaucomac.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DParametresTaucomac.java 29 Jan 2003 12:14:34 -0000 1.1
--- DParametresTaucomac.java 18 Mar 2003 15:26:02 -0000 1.2
***************
*** 526,530 ****
System.out.println("Lecture des parametres");
SParametresTAU params=new SParametresTAU();
! FortranReader f01=new FortranReader(new InputStreamReader(_f01));
// a faire
// int i;
--- 526,530 ----
System.out.println("Lecture des parametres");
SParametresTAU params=new SParametresTAU();
! // FortranReader f01=new FortranReader(new InputStreamReader(_f01));
// a faire
// int i;
Index: DResultatsTaucomac.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac/DResultatsTaucomac.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DResultatsTaucomac.java 29 Jan 2003 12:14:34 -0000 1.1
--- DResultatsTaucomac.java 18 Mar 2003 15:26:02 -0000 1.2
***************
*** 29,34 ****
implements IResultatsTaucomacOperations
{
! private int noEtude;
! private String path;
private SResultatsTAU resultsTAU=null;
--- 29,33 ----
implements IResultatsTaucomacOperations
{
!
private SResultatsTAU resultsTAU=null;
***************
*** 66,84 ****
SResultatsTAU results=new SResultatsTAU();
! FortranReader f02=new FortranReader(new InputStreamReader(_f02));
!
! int fmtT[];
! int fmtD1[];
! int fmtS1[];
! int fmtS2[];
! int fmtD2[];
! int fmtD3[];
! fmtT =new int[] { 20, 55}; //titre
! fmtD1=new int[] { 47, 9};
! fmtS1=new int[] { 31, 16};
! fmtS2=new int[] { 44, 13};
! fmtD2=new int[] { 9,13,1,13,1,13,1,13};
! fmtD3=new int[] { 44, 11};
//====================
// Rappel de donnees
--- 65,83 ----
SResultatsTAU results=new SResultatsTAU();
! // FortranReader f02=new FortranReader(new InputStreamReader(_f02));
! //
! // int fmtT[];
! // int fmtD1[];
! // int fmtS1[];
! // int fmtS2[];
! // int fmtD2[];
! // int fmtD3[];
! // fmtT =new int[] { 20, 55}; //titre
! // fmtD1=new int[] { 47, 9};
! // fmtS1=new int[] { 31, 16};
! // fmtS2=new int[] { 44, 13};
! // fmtD2=new int[] { 9,13,1,13,1,13,1,13};
! // fmtD3=new int[] { 44, 11};
//====================
// Rappel de donnees
Index: DCalculTaucomac.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac/DCalculTaucomac.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DCalculTaucomac.java 29 Jan 2003 12:14:34 -0000 1.1
--- DCalculTaucomac.java 18 Mar 2003 15:26:02 -0000 1.2
***************
*** 65,69 ****
String os=System.getProperty("os.name");
- String drive;
String path=cheminServeur();
--- 65,68 ----
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil
In directory sc8-pr-cvs1:/tmp/cvs-serv17582/dodico/src/org/fudaa/dodico/seuil
Modified Files:
DResultatsSeuil.java DParametresSeuil.java DCalculSeuil.java
SeuilClient.java
Log Message:
suprression variable inutile
Index: DResultatsSeuil.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/DResultatsSeuil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DResultatsSeuil.java 29 Jan 2003 12:14:35 -0000 1.1
--- DResultatsSeuil.java 18 Mar 2003 15:19:53 -0000 1.2
***************
*** 30,35 ****
implements IResultatsSeuilOperations
{
! private int noEtude;
! private String path;
private SResultatsSEU resultsSEU=null;
--- 30,34 ----
implements IResultatsSeuilOperations
{
!
private SResultatsSEU resultsSEU=null;
Index: DParametresSeuil.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/DParametresSeuil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DParametresSeuil.java 29 Jan 2003 12:14:35 -0000 1.1
--- DParametresSeuil.java 18 Mar 2003 15:19:53 -0000 1.2
***************
*** 364,369 ****
// params.profAmont/Aval.nbPoints defini plus bas
! params.profAmont.nomProfil = new String("");
! params.profAval.nomProfil = new String("");
--- 364,369 ----
// params.profAmont/Aval.nbPoints defini plus bas
! params.profAmont.nomProfil = "";
! params.profAval.nomProfil = "";
Index: DCalculSeuil.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/DCalculSeuil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DCalculSeuil.java 29 Jan 2003 12:14:35 -0000 1.1
--- DCalculSeuil.java 18 Mar 2003 15:19:53 -0000 1.2
***************
*** 65,69 ****
String os=System.getProperty("os.name");
- String drive;
String path=cheminServeur();
--- 65,68 ----
Index: SeuilClient.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/SeuilClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SeuilClient.java 29 Jan 2003 12:14:35 -0000 1.1
--- SeuilClient.java 18 Mar 2003 15:19:53 -0000 1.2
***************
*** 29,33 ****
ICalculSeuil seuil=null;
System.out.println("SeuilClient");
! int essai=0;
do {
seuil=ICalculSeuilHelper.narrow(CDodico.findServerByInterface("::seuil::ICalculSeuil"));
--- 29,33 ----
ICalculSeuil seuil=null;
System.out.println("SeuilClient");
! // int essai=0;
do {
seuil=ICalculSeuilHelper.narrow(CDodico.findServerByInterface("::seuil::ICalculSeuil"));
***************
*** 35,39 ****
System.out.println("Creation de la connexion");
! IUsine usine=CDodico.creeUsineLocale();
ServeurPersonne sp=new ServeurPersonne("test-personne-seuil", "test-organisme-seuil");
--- 35,39 ----
System.out.println("Creation de la connexion");
! // IUsine usine=CDodico.creeUsineLocale();
ServeurPersonne sp=new ServeurPersonne("test-personne-seuil", "test-organisme-seuil");
|
|
From: <de...@us...> - 2003-03-18 14:59:56
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv7019/dodico/src/org/fudaa/dodico/commun
Modified Files:
DodicoIOAnalyze.java
Log Message:
maj interne
Index: DodicoIOAnalyze.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoIOAnalyze.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DodicoIOAnalyze.java 18 Mar 2003 10:48:48 -0000 1.1
--- DodicoIOAnalyze.java 18 Mar 2003 14:59:51 -0000 1.2
***************
*** 45,53 ****
String s="";
String t=getResume("Erreurs",errors_);
! if(t!=null) s+=t;
t=getResume("Avertissements",warnings_);
! if(t!=null) s+=t;
t=getResume("Informations",infos_);
! if(t!=null) s+=t;
return s;
}
--- 45,53 ----
String s="";
String t=getResume("Erreurs",errors_);
! if(t!=null) s+=DodicoLib.LINE_SEP+t;
t=getResume("Avertissements",warnings_);
! if(t!=null) s+=DodicoLib.LINE_SEP+t;
t=getResume("Informations",infos_);
! if(t!=null) s+=DodicoLib.LINE_SEP+t;
return s;
}
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io In directory sc8-pr-cvs1:/tmp/cvs-serv6549/dodico/src/org/fudaa/dodico/dunes/io Added Files: DunesAdapter.java DunesInterface.java DunesWriter.java DunesReader.java DunesFileFormat.java Log Message: ajout des classes io pour dunes --- NEW FILE: DunesAdapter.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: DunesInterface.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: DunesWriter.java --- /* * @file DunesWriter.java * @creation 2003-02-20 * @modification $Date: 2003/03/18 14:59:02 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.dunes.io; import java.io.IOException; import java.io.Writer; import org.fudaa.dodico.commun.DodicoIOAnalyze; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.corba.geometrie.SMaillageIndex; import org.fudaa.dodico.corba.geometrie.SPoint; import org.fudaa.dodico.tr.TrLib; import org.fudaa.dodico.tr.TrWriterCharAbstract; /** * * @author deniger * @version $Id: DunesWriter.java,v 1.1 2003/03/18 14:59:02 deniger Exp $ */ public class DunesWriter extends TrWriterCharAbstract { DunesInterface dunes_; DunesFileFormat format_; Writer out_; public DunesWriter() { this(null); } public DunesWriter(DunesFileFormat _f) { super(DunesFileFormat.NB_FILE); if(_f==null) format_=DunesFileFormat.getInstance(); } public void setDunesInterface(DunesInterface _inter) { dunes_ = _inter; } public void setOut(Writer _out) { out_=_out; } /** * Ecrire les donnees de l'interface <code>DunesInterface</code> * sur la sortie <code>Writer</code>. L'ecriture n'est effectuée * que si les points et elements du maillage sont non nuls. * La méthode se termine par un flush mais ne ferme pas le flux. */ public void write() throws IOException { //Test sur les objets a ecrire DodicoIOAnalyze analyze=getAnalyzeFor(0); if (dunes_ == null) { analyze.addError("La structure à écrire est nulle !", -1, true); return; } if(out_==null) { analyze.addError("Le flux de sortie est nul !", -1, true); return; } SMaillageIndex maillage = dunes_.getMaillage(); if (maillage == null) { analyze.addError("Le maillage est nul !", -1, true); return; } SPoint[] pts = dunes_.getMaillage().points; if (pts == null) { analyze.addError("Le maillage ne contient pas de points !", -1, true); return; } int nPts = pts.length; if (nPts == 0) { analyze.addError("Le maillage ne contient pas de points !", -1, true); return; } int[][] elems = maillage.elements; if (elems == null) { analyze.addError("Le maillage ne contient pas d'éléments !", -1, true); return; } int nElems = elems.length; if (nElems == 0) { analyze.addError("Le maillage ne contient pas d'éléments !", -1, true); return; } StringBuffer b = new StringBuffer(600); b.append(format_.getNoeudCode()); b.append(' '); b.append(lineSep_); b.append(nPts); boolean printAdaptatifV = false; double[] adValeur = dunes_.getAdaptatifValeur(); if (adValeur != null) { b.append(' '); b.append(format_.getAdaptatifCode()); printAdaptatifV = true; } else { b.append(format_.getNonAdaptatifCode()); } b.append(lineSep_); //Gestion de l'etat d'avancement //le pas pour afficher l'etat d'avancement int pourc = 0; boolean afficheAvance = (progressReceiver_ == null ? false : true); if (afficheAvance) progressReceiver_.setProgression(pourc); int step = TrLib.getStep(nPts); int pas = (int) (nPts / step); int pMax = pas; int pourcStep = (int) (50 / step); SPoint pt; for (int i = 0; i < nPts; i++) { pt = pts[i]; b.append((i + 1)); b.append(' '); b.append(pt.x); b.append(' '); b.append(pt.y); b.append(' '); b.append(pt.z); b.append(lineSep_); if (printAdaptatifV) { b.append(adValeur[i]); b.append(lineSep_); } writeTo(out_, b); if (afficheAvance) { if (i > pMax) { pourc += pourcStep; progressReceiver_.setProgression(pourc); pMax += pas; } } } //Cette ligne blanche est-elle utile ? b.append(lineSep_); //L'identifiant element b.append(format_.getElementCode()); b.append(lineSep_); //le nb d'éléments b.append(nElems); b.append(lineSep_); //pour afficher l'etat d'avancement step = TrLib.getStep(nElems); pas = (int) (nElems / step); pMax = pas; pourcStep = (int) (50 / step); //les points par elements int[] ppel; //le nombre de points par elements. int nppel; for (int i = 0; i < nElems; i++) { ppel = elems[i]; nppel = ppel.length; //le num d'elements b.append((i + 1)); b.append(' '); //le nombre de point pour l'élément i b.append(nppel); //les indices des points pour l'element i for (int j = 0; j < nppel; j++) { b.append(' '); b.append(ppel[j]); } writelnTo(out_, b); //mis a jour de l'etat d'avancement au cas ou. if (afficheAvance) { if (i > pMax) { pourc += pourcStep; progressReceiver_.setProgression(pourc); pMax += pas; } } } writeTo(out_, b); out_.flush(); return; } public IOException[] close() { return DodicoLib.close(new Writer[]{out_}); } } --- NEW FILE: DunesReader.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: DunesFileFormat.java --- /* * @file TrFileFormatDunes.java * @creation 13 mars 2003 * @modification $Date: 2003/03/18 14:59:02 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.dunes.io; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.tr.TrFileFormat; import org.fudaa.dodico.tr.TrReaderAbstract; import org.fudaa.dodico.tr.TrWriterAbstract; /** * * @author deniger * @version $Id: DunesFileFormat.java,v 1.1 2003/03/18 14:59:02 deniger Exp $ */ public class DunesFileFormat extends TrFileFormat { private final static String NOEUD_ID = "NOEUD"; private final static String ELEMENT_ID = "ELEMENT"; private final static int ADAPTATIF = 2; private final static int NON_ADAPTATIF = 1; public final static int NB_FILE = 1; private static final DunesFileFormat INSTANCE = new DunesFileFormat(); public static final DunesFileFormat getInstance() { return INSTANCE; } private DunesFileFormat() { super(NB_FILE); extensions_ = new String[] { "mail" }; ID_ = "DUNES"; nom_ = "Dunes"; description_ = "utilisé par le mailleur Dunes (logiciel Oasis)"; mode_ = MODE_ASCII; software_ = null; } /** * Returns the aDAPTATIF. * @return int */ public static int getAdaptatifCode() { return ADAPTATIF; } /** * Returns the eLEMENT_ID. * @return String */ public static String getElementCode() { return ELEMENT_ID; } /** * Returns the nOEUD_ID. * @return String */ public static String getNoeudCode() { return NOEUD_ID; } /** * Returns the nON_ADAPTATIF. * @return int */ public static int getNonAdaptatifCode() { return NON_ADAPTATIF; } /** * @see org.fudaa.dodico.tr.TrFileFormat#createReader(File[], ProgressionInterface, boolean, int) */ public TrReaderAbstract createReader( File[] _f, ProgressionInterface _progress, boolean _onlyMNT, int _bufSize) { File f = _f[0]; FileReader cor = null; DunesReader r = new DunesReader(); if (f != null) { try { cor = new FileReader(f); } catch (FileNotFoundException _ex) { r.getAnalyzeFor(0).addError( DodicoLib.geti18n("erreur à l'ouverture") + _ex.getMessage()); if (DodicoLib.DEBUG) _ex.printStackTrace(); } } //r.setOnlyMNT(_onlyMNT); if (_bufSize > 0) r.setIn(cor, _bufSize); else r.setIn(cor); r.setProgressReceiver(_progress); return r; } /** * @see org.fudaa.dodico.tr.TrFileFormat#createWriter(File[], Object, ProgressionInterface) */ public TrWriterAbstract createWriter( File[] _f, Object _source, ProgressionInterface _progress) { File f = _f[0]; DunesWriter r = new DunesWriter(); FileWriter cor = null; try { cor = new FileWriter(f); } catch (IOException _ex) { r.getAnalyzeFor(0).addError( DodicoLib.geti18n("erreur à l'ouverture") + _ex.getMessage()); if (DodicoLib.DEBUG) _ex.printStackTrace(); } r.setOut(cor); r.setDunesInterface((DunesInterface) _source); r.setProgressReceiver(_progress); return r; } } |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation
In directory sc8-pr-cvs1:/tmp/cvs-serv6123/dodico/src/org/fudaa/dodico/representation
Modified Files:
DSpectre.java DCarteComplexe.java DHistoire.java
DCarteHistorique.java DCarteSpectrale.java DCarte.java
DCarteReel.java
Log Message:
*** keyword substitution change ***
Index: DSpectre.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DSpectre.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DSpectre.java 29 Jan 2003 12:14:17 -0000 1.1
--- DSpectre.java 18 Mar 2003 14:57:50 -0000 1.2
***************
*** 65,69 ****
public String toString()
{
! return new String("DSpectre()");
}
--- 65,69 ----
public String toString()
{
! return "DSpectre()";
}
Index: DCarteComplexe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteComplexe.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DHistoire.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DHistoire.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DCarteHistorique.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteHistorique.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DCarteSpectrale.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteSpectrale.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DCarte.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarte.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DCarteReel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteReel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
|
|
From: <de...@us...> - 2003-03-18 14:53:59
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac In directory sc8-pr-cvs1:/tmp/cvs-serv4309/dodico/src/org/fudaa/dodico/taucomac Modified Files: ServeurTaucomac.java Log Message: *** keyword substitution change *** Index: ServeurTaucomac.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac/ServeurTaucomac.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-03-18 14:53:12
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag
In directory sc8-pr-cvs1:/tmp/cvs-serv3956/dodico/src/org/fudaa/dodico/vag
Modified Files:
DCalculVag.java VagClient.java DParametresVag.java
Log Message:
*** keyword substitution change ***
Index: DCalculVag.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/DCalculVag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DCalculVag.java 29 Jan 2003 12:14:27 -0000 1.1
--- DCalculVag.java 18 Mar 2003 14:53:07 -0000 1.2
***************
*** 78,82 ****
String os=System.getProperty("os.name");
- String drive;
String path=cheminServeur();
--- 78,81 ----
***************
*** 89,95 ****
File fic04=getFichier(c, ".04");
File fic05=getFichier(c, ".05");
! File fic08=getFichier(c, ".06");
! File ficOUT=getFichier(c, ".out");
! File ficLPT=getFichier(c, ".lpt");
String noEtude=fic01.getName().substring(3, 7);
DParametresVag.ecritParametres01(fic01, params.parametres01(), noEtude);
--- 88,94 ----
File fic04=getFichier(c, ".04");
File fic05=getFichier(c, ".05");
! // File fic08=getFichier(c, ".06");
! // File ficOUT=getFichier(c, ".out");
! // File ficLPT=getFichier(c, ".lpt");
String noEtude=fic01.getName().substring(3, 7);
DParametresVag.ecritParametres01(fic01, params.parametres01(), noEtude);
Index: VagClient.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/VagClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VagClient.java 29 Jan 2003 12:14:27 -0000 1.1
--- VagClient.java 18 Mar 2003 14:53:07 -0000 1.2
***************
*** 28,32 ****
ICalculVag vag=null;
System.out.println("VagClient");
- int essai=0;
vag=ICalculVagHelper.narrow(CDodico.findServerByName("un-serveur-vag"));
--- 28,31 ----
***************
*** 34,38 ****
System.out.println("Creation de la connexion");
- IUsine usine=CDodico.creeUsineLocale();
ServeurPersonne sp=new ServeurPersonne("test-personne-vag", "test-organisme-vag");
--- 33,36 ----
Index: DParametresVag.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/DParametresVag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DParametresVag.java 29 Jan 2003 12:14:27 -0000 1.1
--- DParametresVag.java 18 Mar 2003 14:53:07 -0000 1.2
***************
*** 10,22 ****
package org.fudaa.dodico.vag;
! import java.io.*;
! import java.util.*;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.calcul.*;
! import org.fudaa.dodico.corba.calcul.*;
! import org.fudaa.dodico.corba.vag.*;
! import org.fudaa.dodico.fortran.*;
/**
--- 10,34 ----
package org.fudaa.dodico.vag;
! import java.io.File;
! import java.io.FileInputStream;
! import java.io.FileOutputStream;
! import java.io.IOException;
! import java.io.InputStream;
! import java.io.InputStreamReader;
! import java.io.OutputStream;
! import java.io.OutputStreamWriter;
! import org.fudaa.dodico.calcul.DParametres;
! import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.dodico.corba.vag.IParametresVagOperations;
! import org.fudaa.dodico.corba.vag.SParametres01;
! import org.fudaa.dodico.corba.vag.SParametres02;
! import org.fudaa.dodico.corba.vag.SParametres03;
! import org.fudaa.dodico.corba.vag.SParametres04;
! import org.fudaa.dodico.corba.vag.SParametresLigne02;
! import org.fudaa.dodico.fortran.FortranReader;
! import org.fudaa.dodico.fortran.FortranWriter;
! import org.fudaa.dodico.fortran.NativeBinaryInputStream;
! import org.fudaa.dodico.fortran.NativeBinaryOutputStream;
/**
***************
*** 60,66 ****
System.out.println("Ecriture des parametres 01");
FortranWriter f01=new FortranWriter(new OutputStreamWriter(_f01));
! if( System.getProperty("os.name").startsWith("Windows") )
! f01.setLineSeparator("\r\n"); // fichiers DOS (\r)
! else f01.setLineSeparator("\n");
int fmtI[], fmtD[];
--- 72,77 ----
System.out.println("Ecriture des parametres 01");
FortranWriter f01=new FortranWriter(new OutputStreamWriter(_f01));
! f01.setLineSeparator(DodicoLib.LINE_SEP);
! String vide="";
int fmtI[], fmtD[];
***************
*** 75,81 ****
f01.doubleField(0, _params.echelle);
! f01.stringField(1, ""); // remplissage des colonnes vides
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "ECHELLE DE LA CARTE");
f01.writeFields(fmtD);
--- 86,92 ----
f01.doubleField(0, _params.echelle);
! f01.stringField(1, vide); // remplissage des colonnes vides
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "ECHELLE DE LA CARTE");
f01.writeFields(fmtD);
***************
*** 83,88 ****
f01.doubleField(0, _params.rectLargeur);
f01.doubleField(1, _params.rectHauteur);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "DIMENSION DU RECTANGLE");
f01.writeFields(fmtD);
--- 94,99 ----
f01.doubleField(0, _params.rectLargeur);
f01.doubleField(1, _params.rectHauteur);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "DIMENSION DU RECTANGLE");
f01.writeFields(fmtD);
***************
*** 91,95 ****
f01.intField (1, _params.digitaliseur);
f01.intField (2, _params.traceur);
! f01.stringField(3, "");
f01.stringField(4, "TERMINAL, DIGITALISEUR ET TRACEUR");
f01.writeFields(fmtI);
--- 102,106 ----
f01.intField (1, _params.digitaliseur);
f01.intField (2, _params.traceur);
! f01.stringField(3, vide);
f01.stringField(4, "TERMINAL, DIGITALISEUR ET TRACEUR");
f01.writeFields(fmtI);
***************
*** 97,102 ****
f01.intField (0, _params.nbMaillesX);
f01.intField (1, _params.nbMaillesY);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "NOMBRE DE MAILLES SUIVANT OX ET OY");
f01.writeFields(fmtI);
--- 108,113 ----
f01.intField (0, _params.nbMaillesX);
f01.intField (1, _params.nbMaillesY);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "NOMBRE DE MAILLES SUIVANT OX ET OY");
f01.writeFields(fmtI);
***************
*** 104,109 ****
f01.doubleField(0, _params.segArretDebutX);
f01.doubleField(1, _params.segArretDebutY);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "COOR. DE DEBUT DU SEGMENT D'ARRET");
f01.writeFields(fmtD);
--- 115,120 ----
f01.doubleField(0, _params.segArretDebutX);
f01.doubleField(1, _params.segArretDebutY);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "COOR. DE DEBUT DU SEGMENT D'ARRET");
f01.writeFields(fmtD);
***************
*** 111,116 ****
f01.doubleField(0, _params.segArretFinX);
f01.doubleField(1, _params.segArretFinY);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "COOR. DE FIN DU SEGMENT D'ARRET");
f01.writeFields(fmtD);
--- 122,127 ----
f01.doubleField(0, _params.segArretFinX);
f01.doubleField(1, _params.segArretFinY);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "COOR. DE FIN DU SEGMENT D'ARRET");
f01.writeFields(fmtD);
***************
*** 119,123 ****
f01.doubleField(1, _params.flecheNordY);
f01.doubleField(2, _params.flecheNordDir);
! f01.stringField(3, "");
f01.stringField(4, "COOR. ET DIREC. DE LA FLECHE NORD");
f01.writeFields(fmtD);
--- 130,134 ----
f01.doubleField(1, _params.flecheNordY);
f01.doubleField(2, _params.flecheNordDir);
! f01.stringField(3, vide);
f01.stringField(4, "COOR. ET DIREC. DE LA FLECHE NORD");
f01.writeFields(fmtD);
***************
*** 125,137 ****
f01.intField (0, _params.codeImp);
f01.intField (1, _params.pasCalcul);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "CODE D'IMP. ET PAS DE CALCUL");
f01.writeFields(fmtI);
f01.doubleField(0, _params.echTracePapier);
! f01.stringField(1, "");
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "ECHELLE DES TRACES SUR PAPIER");
f01.writeFields(fmtD);
--- 136,148 ----
f01.intField (0, _params.codeImp);
f01.intField (1, _params.pasCalcul);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "CODE D'IMP. ET PAS DE CALCUL");
f01.writeFields(fmtI);
f01.doubleField(0, _params.echTracePapier);
! f01.stringField(1, vide);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "ECHELLE DES TRACES SUR PAPIER");
f01.writeFields(fmtD);
***************
*** 139,144 ****
f01.doubleField(0, _params.coinInfGX);
f01.doubleField(1, _params.coinInfGY);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "COOR. DU COIN INFERIEUR GAUCHE");
f01.writeFields(fmtD);
--- 150,155 ----
f01.doubleField(0, _params.coinInfGX);
f01.doubleField(1, _params.coinInfGY);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "COOR. DU COIN INFERIEUR GAUCHE");
f01.writeFields(fmtD);
***************
*** 146,165 ****
f01.doubleField(0, _params.coinInfDX);
f01.doubleField(1, _params.coinInfDY);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "COOR. DU COIN INFERIEUR DROIT");
f01.writeFields(fmtD);
f01.doubleField(0, _params.cadreTracesHauteur);
! f01.stringField(1, "");
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "HAUTEUR DU CADRE DES TRACES");
f01.writeFields(fmtD);
f01.intField (0, _params.cartoucheTracesPosition);
! f01.stringField(1, "");
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "POSITION DU CARTOUCHE DES TRACES");
f01.writeFields(fmtI);
--- 157,176 ----
f01.doubleField(0, _params.coinInfDX);
f01.doubleField(1, _params.coinInfDY);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "COOR. DU COIN INFERIEUR DROIT");
f01.writeFields(fmtD);
f01.doubleField(0, _params.cadreTracesHauteur);
! f01.stringField(1, vide);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "HAUTEUR DU CADRE DES TRACES");
f01.writeFields(fmtD);
f01.intField (0, _params.cartoucheTracesPosition);
! f01.stringField(1, vide);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "POSITION DU CARTOUCHE DES TRACES");
f01.writeFields(fmtI);
|
|
From: <de...@us...> - 2003-03-18 14:50:53
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geodesie
In directory sc8-pr-cvs1:/tmp/cvs-serv2399/dodico/src/org/fudaa/dodico/geodesie
Modified Files:
SysGeodesique.java Ellipsoide.java SysGeodesiqueLambert.java
Log Message:
suprression variables inutiles
Index: SysGeodesique.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geodesie/SysGeodesique.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SysGeodesique.java 29 Jan 2003 12:14:20 -0000 1.1
--- SysGeodesique.java 18 Mar 2003 14:50:48 -0000 1.2
***************
*** 508,515 ****
double phi;
double he;
- double N;
- double X;
- double Y;
- double Z;
double e = ellipsoide_.e();
double a = ellipsoide_.a();
--- 508,511 ----
Index: Ellipsoide.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geodesie/Ellipsoide.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Ellipsoide.java 29 Jan 2003 12:14:20 -0000 1.1
--- Ellipsoide.java 18 Mar 2003 14:50:48 -0000 1.2
***************
*** 21,25 ****
/** Le nombre de type d'ellipsoide predefinie */
! private static int NB_TYPE = 4;
/** */
--- 21,25 ----
/** Le nombre de type d'ellipsoide predefinie */
! // private static int NB_TYPE = 4;
/** */
Index: SysGeodesiqueLambert.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geodesie/SysGeodesiqueLambert.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SysGeodesiqueLambert.java 29 Jan 2003 12:14:20 -0000 1.1
--- SysGeodesiqueLambert.java 18 Mar 2003 14:50:49 -0000 1.2
***************
*** 325,331 ****
double Xi;
double Yi;
- double gamF;
- double Rf;
- double nFi = _sysDest.n() / n_;
double[] r = new double[entree.length];
double[] temp = new double[2];
--- 325,328 ----
|
|
From: <de...@us...> - 2003-03-18 14:48:49
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/tr
In directory sc8-pr-cvs1:/tmp/cvs-serv1689/dodico/src/org/fudaa/dodico/tr
Added Files:
TrFileReadView.java TrWriterCharAbstract.java
TrReaderWriterAbstract.java TrWriterAbstract.java
TrFileFormat.java TrLib.java TrReaderAbstract.java
Log Message:
ajout des classesde base pour les operations io
--- NEW FILE: TrFileReadView.java ---
/*
* @file TrFileReadView.java
* @creation 12 mars 2003
* @modification $Date: 2003/03/18 14:48:44 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.tr;
import java.io.File;
import java.io.IOException;
import org.fudaa.dodico.commun.DodicoIOAnalyze;
/**
*
* @author deniger
* @version $Id: TrFileReadView.java,v 1.1 2003/03/18 14:48:44 deniger Exp $
*/
public class TrFileReadView
{
private TrFileFormat format_;
private File[] file_;
private Object source_;
private IOException[] exClose_;
private TrFileReadView.Analyze[] analyzes_;
public TrFileReadView(File _f,Object _source,TrFileFormat _form,DodicoIOAnalyze[] _analyse,IOException[] _closeExs)
{
this(new File[]{_f},_source,_form,_analyse,_closeExs);
}
public TrFileReadView(File[] _f,Object _source,TrFileFormat _form,DodicoIOAnalyze[] _analyse,IOException[] _closeExs)
{
file_=_f;
source_=_source;
format_=_form;
exClose_=_closeExs;
setAnalyze(_analyse);
}
private void setAnalyze(DodicoIOAnalyze[] _analyzes)
{
if(_analyzes!=null)
{
int l=_analyzes.length;
analyzes_=new TrFileReadView.Analyze[l];
for (int i = l-1; i >= 0; i--)
{
analyzes_[i]=new TrFileReadView.Analyze(_analyzes[i]);
}
}
}
public TrFileReadView.Analyze[] getAnalyzes()
{
return analyzes_;
}
/**
* Returns the source.
* @return Object
*/
public Object getSource()
{
return source_;
}
static public class Analyze
{
private DodicoIOAnalyze.Field[] errors_;
private DodicoIOAnalyze.Field[] warns_;
private DodicoIOAnalyze.Field[] infos_;
public Analyze(DodicoIOAnalyze _io)
{
if(_io!=null)
{
errors_=_io.getErrors();
warns_=_io.getWarnings();
infos_=_io.getInfos();
}
}
}
}
--- NEW FILE: TrWriterCharAbstract.java ---
/*
* @file WriterCharAbstract.java
* @creation 12 mars 2003
* @modification $Date: 2003/03/18 14:48:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.tr;
import java.io.IOException;
import java.io.Writer;
import org.fudaa.dodico.commun.DodicoLib;
/**
*
* @author deniger
* @version $Id: TrWriterCharAbstract.java,v 1.1 2003/03/18 14:48:45 deniger Exp $
*/
public abstract class TrWriterCharAbstract extends TrWriterAbstract
{
protected String lineSep_;
//protected Writer[] outs_;
public TrWriterCharAbstract(int _n)
{
super(_n);
lineSep_= DodicoLib.LINE_SEP;
}
public void writelnTo(Writer _out, StringBuffer _b) throws IOException
{
writeTo(_out, _b.append(lineSep_));
}
public void writeTo(Writer _out, StringBuffer _b) throws IOException
{
int l = _b.length();
char[] c = new char[l];
_b.getChars(0, l, c, 0);
_out.write(c);
_b.setLength(0);
}
/**
* Renvoie le separateur de ligne.
* @return separateur de ligne
*/
public String getLineSeparator()
{
return lineSep_;
}
/**
* Modifie le separateur de ligne.
* @param lineSep The lineSep to set
*/
public void setLineSeparator(String lineSep)
{
lineSep_ = lineSep;
}
}
--- NEW FILE: TrReaderWriterAbstract.java ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: TrWriterAbstract.java ---
/*
* @file TrWriterAbstract.java
* @creation 13 mars 2003
* @modification $Date: 2003/03/18 14:48:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.tr;
import java.io.IOException;
/**
*
* @author deniger
* @version $Id: TrWriterAbstract.java,v 1.1 2003/03/18 14:48:45 deniger Exp $
*/
public abstract class TrWriterAbstract extends TrReaderWriterAbstract
{
public TrWriterAbstract(int _n)
{ super(_n);}
public abstract void write() throws IOException;
}
--- NEW FILE: TrFileFormat.java ---
/*
* @file TrFileFormat.java
* @creation 12 mars 2003
* @modification $Date: 2003/03/18 14:48:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.tr;
import java.io.File;
import java.io.IOException;
import org.fudaa.dodico.commun.DodicoFileFormat;
import org.fudaa.dodico.commun.DodicoIOAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
/**
*
* @author deniger
* @version $Id: TrFileFormat.java,v 1.1 2003/03/18 14:48:45 deniger Exp $
*/
public abstract class TrFileFormat extends DodicoFileFormat
{
public TrFileFormat(int _nb)
{
super(_nb);
}
public boolean containsMaillage()
{
return false;
}
public boolean containsProprietesNodales()
{
return false;
}
public boolean containsConditionsLimites()
{
return false;
}
public boolean containsSolutionsInitiales()
{
return false;
}
public abstract TrWriterAbstract createWriter(File[] _f,Object _source,ProgressionInterface _progress);
public abstract TrReaderAbstract createReader(File[] _f,ProgressionInterface _progress,boolean _onlyMNT,int _bufSize);
public final TrFileReadView read(File _f)
{
return read(getFile(_f),null,false,-1);
}
public final TrFileReadView read(File[] _f)
{
return read(_f,null,false,-1);
}
public final TrFileReadView read(File[] _f,ProgressionInterface _progress,boolean _onlyMNT,int _bufSize)
{
int l=_f.length;
if(l!=getNbFile())
throw new IllegalArgumentException("Le nombre de fichier donne "+l+DodicoLib.LINE_SEP+"Nb Fichier attendu "+getNbFile());
TrReaderAbstract r=createReader(_f,_progress,_onlyMNT,_bufSize);
// DodicoIOAnalyze[] analyzes;
try
{
r.read();
}
catch(IOException _e)
{
r.getAnalyzeFor(0).addError(DodicoLib.geti18n("Erreur d'entrée sortie")+" "+_e.getMessage(),-1);
}
IOException[] exs=r.close();
return new TrFileReadView(_f,r.getInterface(),this,r.getAnalyzes(),exs);
}
public final TrFileReadView write(File _f,Object _interface)
{
return write(getFile(_f),_interface,null);
}
public final TrFileReadView write(File[] _f,Object _interface)
{
return write(_f,_interface,null);
}
public final TrFileReadView write(File[] _f,Object _interface,ProgressionInterface _progress)
{
int l=_f.length;
if(l!=getNbFile())
throw new IllegalArgumentException("Le nombre de fichier donne "+l+DodicoLib.LINE_SEP+"Nb Fichier attendu "+getNbFile());
TrWriterAbstract r=createWriter(_f,_interface,_progress);
// DodicoIOAnalyze[] analyzes;
try
{
r.write();
}
catch(IOException _e)
{
r.getAnalyzeFor(0).addError(DodicoLib.geti18n("Erreur d'entrée sortie")+" "+_e.getMessage(),-1);
}
IOException[] exs=r.close();
return new TrFileReadView(_f,_interface,this,r.getAnalyzes(),exs);
}
}
--- NEW FILE: TrLib.java ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: TrReaderAbstract.java ---
/*
* @file TrReaderAbstract.java
* @creation 13 mars 2003
* @modification $Date: 2003/03/18 14:48:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.tr;
import java.io.IOException;
/**
*
* @author deniger
* @version $Id: TrReaderAbstract.java,v 1.1 2003/03/18 14:48:45 deniger Exp $
*/
public abstract class TrReaderAbstract extends TrReaderWriterAbstract
{
public TrReaderAbstract(int _nb)
{
super(_nb);
}
public abstract void read() throws IOException;
public abstract Object getInterface();
}
|
|
From: <de...@us...> - 2003-03-18 14:47:01
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv31756/dodico/src/org/fudaa/dodico/test/telemac
Modified Files:
simple.sx exemple.res
Added Files:
TestCL.java
Log Message:
ajout des classes io pour telemac
--- NEW FILE: TestCL.java ---
/*
* @file TestSerafin.java
* @creation 2002-11-20
* @modification $Date: 2003/03/18 14:46:56 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.test.telemac;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
import junit.framework.TestCase;
import org.fudaa.dodico.commun.DodicoIOAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionBuAdapter;
import org.fudaa.dodico.telemac.io.TelemacCLInterface;
import org.fudaa.dodico.telemac.io.TelemacCLReader;
import com.memoire.bu.BuTask;
/**
* @version $Id: TestCL.java,v 1.1 2003/03/18 14:46:56 deniger Exp $
* @author Fred Deniger
*/
public class TestCL extends TestCase
{
double eps_;
TelemacCLInterface t_;
/** */
public TestCL()
{
eps_ = 1E-15;
// t_ = lecture(getFile("exemple.res"),NativeBinaryInputStream.SPARC);
// assertNotNull(t_);
}
/**
* @param _f
* @return File
*/
private File getFile(String _f)
{
URL url = getClass().getResource(_f);
if (url == null)
return null;
return new File(url.getPath());
}
/**
* Lit le fichier passe en argument.
*
* @param args
*/
public static void main(String[] args)
{
HashMap arg = DodicoLib.parseArgs(args);
String fileName = (String) arg.get("-f");
if (fileName == null)
fileName = (String) arg.get("-file");
if (fileName == null)
{
System.err.println("Usage: -file=monFichier.mail -out=monFichierReecrit");
return;
}
File f=new File(fileName);
if (!f.exists())
{
System.err.println("Fichier inexistant " + f.getAbsolutePath());
return;
}
TelemacCLReader r = null;
TelemacCLInterface inter = null;
ProgressionBuAdapter progress = new ProgressionBuAdapter(new BuTask());
try
{
r=new TelemacCLReader();
r.setIn(new FileReader(f));
r.setProgressReceiver(progress);
r.read();
DodicoIOAnalyze a=r.getAnalyze();
if(a!=null)
{
System.out.println("prob lecture");
a.printResume();
}
inter=r.getTelemacCLInterface();
}
catch(IOException e)
{
e.printStackTrace();
}
if(inter==null)
{
System.out.println("interface nulle");
}
else
{
inter.getLine()[136].printResume();
}
}
private final static synchronized TelemacCLInterface lecture(File _f,String _type)
{
// SerafinInterface t = null;
// try
// {
// assertNotNull(_f);
// InputStream in = new FileInputStream(_f);
// SerafinReader re=new SerafinReader();
// re.setMachineId(_type);
// re.setIn(in);
// re.read();
// assertNull(re.getAnalyze());
// t = re.getSerafinInterface();
// in.close();
// }
// catch (IOException _e)
// {
// _e.printStackTrace();
// }
// return t;
return null;
}
public void testLecture()
{
}
/**A unit test for JUnit */
public void testEcriture()
{
File f = null;
try
{
// f = File.createTempFile("testSerafin", ".ser");
// assertNotNull(f);
// OutputStream out = new FileOutputStream(f);
// SerafinWriter w = new SerafinWriter();
// w.setMachineID(NativeBinaryInputStream.X86);
// w.setSerafinInterface(t_);
// w.setOut(out);
// w.write();
// assertNull(w.getAnalyze());
// t_ = lecture(f,NativeBinaryInputStream.X86);
// testLecture();
}
catch (Exception _e)
{
_e.printStackTrace();
fail(_e.toString());
}
finally
{
if (f != null)
f.delete();
}
}
}
Index: simple.sx
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/simple.sx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** simple.sx 29 Jan 2003 12:14:44 -0000 1.1
--- simple.sx 18 Mar 2003 14:46:56 -0000 1.2
***************
*** 1,42 ****
! C simple.sx
! C 10/11/2002
! C Semis de point
! B S
! CN semis
! C Les points
! 0 0 0
! 1 1 1
! 2 2 2
! 3 3 3
!
!
! C courbe X Y Z
! B C
! CN courbe
! CP 0 1
! CP 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
! CP 0
! C les points
! 0 0 0
! 5 5 5
! 10 10 10
! 15 15 15
!
!
! C Courbe de niveau
! B N
! CN niveau
! CP 0 1
! C L'indication CP est ignore
! CP 15
! CP O
! C les points
! 100 100 100
! 200 200 200
!
! C Semis de point 2
! B S
! CN semis2
! C Les points
! 4 4 4
!
--- 1,42 ----
! C simple.sx
! C 10/11/2002
! C Semis de point
! B S
! CN semis
! C Les points
! 0 0 0
! 1 1 1
! 2 2 2
! 3 3 3
!
!
! C courbe X Y Z
! B C
! CN courbe
! CP 0 1
! CP 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
! CP 0
! C les points
! 0 0 0
! 5 5 5
! 10 10 10
! 15 15 15
!
!
! C Courbe de niveau
! B N
! CN niveau
! CP 0 1
! C L'indication CP est ignore
! CP 15
! CP O
! C les points
! 100 100 100
! 200 200 200
!
! C Semis de point 2
! B S
! CN semis2
! C Les points
! 4 4 4
!
Index: exemple.res
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/exemple.res,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsZQpmZJ and /tmp/cvsatr9el differ
|
|
From: <de...@us...> - 2003-03-18 14:42:31
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io In directory sc8-pr-cvs1:/tmp/cvs-serv30592/dodico/src/org/fudaa/dodico/telemac/io Added Files: TelemacCLLine.java Log Message: ajout des classes io pour telemac --- NEW FILE: TelemacCLLine.java --- /* * @file TelemacCLLine.java * @creation 14 mars 2003 * @modification $Date: 2003/03/18 14:42:27 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.telemac.io; import org.fudaa.dodico.commun.DodicoLib; /** * * @author deniger * @version $Id: TelemacCLLine.java,v 1.1 2003/03/18 14:42:27 deniger Exp $ */ public class TelemacCLLine { /** * Code pour la hauteur. */ protected int lihbor_; /** * Code pour u. */ protected int liubor_; /** * Code pour v. */ protected int livbor_; /** * valeur de la hauteur. */ protected double hbor_; /** * valeur de u. */ protected double ubor_; /** * valeur de v. */ protected double vbor_; /** * valeur du coeff de frottement. */ protected double aubor_; /** * Code pour le traceur. */ protected int litbor_; /** * valeur du traceur. */ protected double tbor_; /** * Coefficent a pour la loi de flux. */ protected double atbor_; /** * Coefficent b pour la loi de flux. */ protected double btbor_; /** * Numero global. */ protected int n_; /** * Numero dans la numerotation des points de bord. */ protected int k_; public String getResume() { return lihbor_ + " " + liubor_ + " " + livbor_ + " " + hbor_ + " " + ubor_ + " " + vbor_ + " " + aubor_ + " " + litbor_ + " " + tbor_ + " " + atbor_ + " " + btbor_ + " " + n_ + " " + k_; } public void printResume() { System.out.println(getResume()); } } |
|
From: <de...@us...> - 2003-03-18 14:41:44
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io In directory sc8-pr-cvs1:/tmp/cvs-serv30158/dodico/src/org/fudaa/dodico/telemac/io Added Files: TelemacCLReader.java Log Message: ajout des classes io pour telemac --- NEW FILE: TelemacCLReader.java --- /* * @file TelemacCIReader.java * @creation 14 mars 2003 * @modification $Date: 2003/03/18 14:41:40 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.telemac.io; import java.io.EOFException; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.fortran.FortranReader; import org.fudaa.dodico.tr.TrReaderAbstract; /** * * @author deniger * @version $Id: TelemacCLReader.java,v 1.1 2003/03/18 14:41:40 deniger Exp $ */ public class TelemacCLReader extends TrReaderAbstract { FortranReader in_; TelemacCLAdapter inter_; int nbPoint_; TelemacCLFileFormat format_; public TelemacCLReader() { this(null); } public TelemacCLReader(TelemacCLFileFormat _f) { super(TelemacCLFileFormat.NB_FILE); format_=_f; if(format_==null) format_=TelemacCLFileFormat.getInstance(); } public void setIn(Reader _r) { if (_r != null) in_ = new FortranReader(_r); } public void setIn(Reader _r, int _sz) { if (_r != null) in_ = new FortranReader(_r, _sz); } public void setNBPointExpected(int _i) { nbPoint_ = _i; } /** * @see org.fudaa.dodico.tr.TrReaderAbstract#read() */ public void read() throws IOException { if (in_ == null) { getAnalyzeFor(0).addTranslateError("Le flux est nul."); return; } in_.setJumpBlankLine(true); ArrayList l = null; if (nbPoint_ > 0) l = new ArrayList(nbPoint_); else l = new ArrayList(100); //Au hasard :-) int index = 0; int nbField; try { TelemacCLLine cl; while (true) { in_.readFields(); nbField = in_.getNumberOfFields(); if (nbField != 13) { getAnalyzeFor(0).addError( "Ligne non valide: elle doit contenir 12 champs", in_); if (nbField == 14) { getAnalyzeFor(0).addInfo("Maillage cartésien non supporté", in_); } return; } cl = new TelemacCLLine(); cl.lihbor_ = in_.intField(0); if(!format_.isCodeHauteur(cl.lihbor_)) { getAnalyzeFor(0).addError(DodicoLib.geti18n("Code inconnu pour la hauteur")+" "+cl.lihbor_, in_, true); return; } cl.liubor_ = in_.intField(1); if(!format_.isCodeVitesse(cl.liubor_)) { getAnalyzeFor(0).addError(DodicoLib.geti18n("Code inconnu pour la vitesse u")+" "+cl.lihbor_, in_, true); return; } cl.livbor_ = in_.intField(2); if(!format_.isCodeVitesse(cl.livbor_)) { getAnalyzeFor(0).addError(DodicoLib.geti18n("Code inconnu pour la vitesse v")+" "+cl.lihbor_, in_, true); return; } cl.hbor_ = in_.doubleField(3); cl.ubor_ = in_.doubleField(4); cl.vbor_ = in_.doubleField(5); cl.aubor_ = in_.doubleField(6); cl.litbor_ = in_.intField(7); if(!format_.isCodeTraceur(cl.litbor_)) { getAnalyzeFor(0).addError(DodicoLib.geti18n("Code inconnu pour le traceur")+" "+cl.lihbor_, in_, true); return; } cl.tbor_ = in_.doubleField(8); cl.atbor_ = in_.doubleField(9); cl.btbor_ = in_.doubleField(10); cl.n_ = in_.intField(11); cl.k_ = in_.intField(12); index++; if (cl.k_ != index) { getAnalyzeFor(0).addError("L'index donne est invalide", in_, true); getAnalyzeFor(0).addInfo( DodicoLib.geti18n("index donné") + ": " + cl.k_ + DodicoLib.LINE_SEP + DodicoLib.geti18n("index attendu") + ": " + index, in_, true); return; } l.add(cl); } } catch (EOFException _oef) { if (DodicoLib.DEBUG) System.out.println("Lecture terminée"); } catch (NumberFormatException _ex) { getAnalyzeFor(0).addError( DodicoLib.geti18n("Format invalide") + " " + _ex.getMessage(), in_); return; } int n=l.size(); inter_=null; if(n>0) { TelemacCLLine[] lines=new TelemacCLLine[n]; l.toArray(lines); inter_=new TelemacCLAdapter(lines); } } /** * @see org.fudaa.dodico.tr.TrReaderAbstract#getInterface() */ public Object getInterface() { return getTelemacCLInterface(); } public TelemacCLInterface getTelemacCLInterface() { return inter_; } /** * @see org.fudaa.dodico.tr.TrReaderWriterAbstract#close() */ public IOException[] close() { return null; } } |
|
From: <de...@us...> - 2003-03-18 14:35:57
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io In directory sc8-pr-cvs1:/tmp/cvs-serv26904/dodico/src/org/fudaa/dodico/telemac/io Log Message: Directory /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io added to the repository |
|
From: <de...@us...> - 2003-03-18 14:13:24
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag In directory sc8-pr-cvs1:/tmp/cvs-serv14864/dodico/src/org/fudaa/dodico/vag Modified Files: ServeurVag.java DResultatsVag.java Log Message: *** keyword substitution change *** Index: ServeurVag.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/ServeurVag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DResultatsVag.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/DResultatsVag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-03-18 14:07:32
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/tr In directory sc8-pr-cvs1:/tmp/cvs-serv11012/dodico/src/org/fudaa/dodico/tr Log Message: Directory /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/tr added to the repository |
|
From: <de...@us...> - 2003-03-18 14:05:58
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/geodesie
In directory sc8-pr-cvs1:/tmp/cvs-serv8811/dodico/src/org/fudaa/dodico/test/geodesie
Modified Files:
TestLambert.java
Log Message:
ajout des tests pour la lecture et ecriture des fichiers telemac/reflux
Index: TestLambert.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/geodesie/TestLambert.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestLambert.java 29 Jan 2003 12:14:45 -0000 1.1
--- TestLambert.java 18 Mar 2003 14:05:22 -0000 1.2
***************
*** 55,59 ****
double[] r;
double[] sortie;
- double[] entree;
System.out.println("Changement de projection I");
double lonParis=SysGeodesique.enDegre(2,20,14.025);
--- 55,58 ----
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test
In directory sc8-pr-cvs1:/tmp/cvs-serv8811/dodico/src/org/fudaa/dodico/test
Modified Files:
TestCTableau.java TestCPoint.java TestCPolygone.java
TestStructure.java TestCProprietePhysique.java
TestCMatriceComplexe.java
Log Message:
ajout des tests pour la lecture et ecriture des fichiers telemac/reflux
Index: TestCTableau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCTableau.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestCTableau.java 29 Jan 2003 12:14:21 -0000 1.1
--- TestCTableau.java 18 Mar 2003 14:05:19 -0000 1.2
***************
*** 45,50 ****
public static void main(String[] args)
{
- int i,j;
-
ITableau a=ITableauHelper.narrow(new DTableau().tie());
affiche(a);
--- 45,48 ----
Index: TestCPoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCPoint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestCPoint.java 29 Jan 2003 12:14:21 -0000 1.1
--- TestCPoint.java 18 Mar 2003 14:05:20 -0000 1.2
***************
*** 30,36 ****
public static void main(String[] args)
{
- int i;
- int j;
-
IPoint a = IPointHelper.narrow(new DPoint().tie());
a.coordonnees( new double[] {5., 6.,0});
--- 30,33 ----
Index: TestCPolygone.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCPolygone.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestCPolygone.java 29 Jan 2003 12:14:21 -0000 1.1
--- TestCPolygone.java 18 Mar 2003 14:05:20 -0000 1.2
***************
*** 75,79 ****
IPoint point3=IPointHelper.narrow(new DPoint().tie());
point3.coordonnees(new double[]{-2,0,0});
! IPoint[] points1 = {point1,point2,point3};
// p1.frontiere((IPolygoneHelper.narrow(new DPolygone().tie())).points(points1));
affiche("p1", p1);
--- 75,79 ----
IPoint point3=IPointHelper.narrow(new DPoint().tie());
point3.coordonnees(new double[]{-2,0,0});
! // IPoint[] points1 = {point1,point2,point3};
// p1.frontiere((IPolygoneHelper.narrow(new DPolygone().tie())).points(points1));
affiche("p1", p1);
***************
*** 102,108 ****
! IPoint[] points2 = {point1,point2,point3};
IPolygone p2 = IPolygoneHelper.narrow(new DPolygone().tie());
! // p2.points(points2);
affiche("p2", p2);
--- 102,108 ----
! //IPoint[] points2 = {point1,point2,point3};
IPolygone p2 = IPolygoneHelper.narrow(new DPolygone().tie());
! //p2.(points2);
affiche("p2", p2);
***************
*** 110,114 ****
affiche("p3", p3);
point1.coordonnees(new double[]{1,3,0});
! IPoint[] points3 = {point1,point2,point3};
// p2.frontiere((IPolygoneHelper.narrow(new DPolygone().tie())).points(points3));
affiche("p2", p2);
--- 110,114 ----
affiche("p3", p3);
point1.coordonnees(new double[]{1,3,0});
! // IPoint[] points3 = {point1,point2,point3};
// p2.frontiere((IPolygoneHelper.narrow(new DPolygone().tie())).points(points3));
affiche("p2", p2);
Index: TestStructure.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestStructure.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestStructure.java 21 Feb 2003 16:24:13 -0000 1.1
--- TestStructure.java 18 Mar 2003 14:05:20 -0000 1.2
***************
*** 47,54 ****
public static void main(String [] args)
{
! TestStructure t=new TestStructure(10000);
! while(true)
! {
! }
}
}
--- 47,51 ----
public static void main(String [] args)
{
! new TestStructure(10000);
}
}
Index: TestCProprietePhysique.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCProprietePhysique.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestCProprietePhysique.java 29 Jan 2003 12:14:21 -0000 1.1
--- TestCProprietePhysique.java 18 Mar 2003 14:05:20 -0000 1.2
***************
*** 53,59 ****
public static void main(String[] args)
{
- int i;
- int j;
-
IEvolutionConstante evol = IEvolutionConstanteHelper.narrow(new DEvolutionConstante().tie());
ITableau itab = ITableauHelper.narrow(new DTableau().tie());
--- 53,56 ----
Index: TestCMatriceComplexe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestCMatriceComplexe.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestCMatriceComplexe.java 29 Jan 2003 12:14:21 -0000 1.1
--- TestCMatriceComplexe.java 18 Mar 2003 14:05:21 -0000 1.2
***************
*** 52,56 ****
str+=" "+CMathComplexe.enChaine(_tab[i][j]);
System.out.println("ligne "+i+":"+str);
! str=new String("");
}
System.out.println("");
--- 52,56 ----
str+=" "+CMathComplexe.enChaine(_tab[i][j]);
System.out.println("ligne "+i+":"+str);
! str="";
}
System.out.println("");
|
|
From: <de...@us...> - 2003-03-18 14:05:55
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv8811/dodico/src/org/fudaa/dodico/test/reflux
Modified Files:
TestDunes.java
Log Message:
ajout des tests pour la lecture et ecriture des fichiers telemac/reflux
Index: TestDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestDunes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestDunes.java 21 Feb 2003 16:27:59 -0000 1.1
--- TestDunes.java 18 Mar 2003 14:05:21 -0000 1.2
***************
*** 18,28 ****
import junit.framework.TestCase;
! import org.fudaa.dodico.commun.DodicoIOAnalyse;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionBuAdapter;
import org.fudaa.dodico.corba.geometrie.SPoint;
! import org.fudaa.dodico.tr.reflux.DunesInterface;
! import org.fudaa.dodico.tr.reflux.DunesReader;
! import org.fudaa.dodico.tr.reflux.DunesWriter;
import com.memoire.bu.BuTask;
--- 18,28 ----
import junit.framework.TestCase;
! import org.fudaa.dodico.commun.DodicoIOAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionBuAdapter;
import org.fudaa.dodico.corba.geometrie.SPoint;
! import org.fudaa.dodico.dunes.io.DunesInterface;
! import org.fudaa.dodico.dunes.io.DunesReader;
! import org.fudaa.dodico.dunes.io.DunesWriter;
import com.memoire.bu.BuTask;
***************
*** 37,60 ****
double eps_;
DunesInterface t_;
!
public TestDunes()
{
! eps_=1E-15;
! t_=lecture(getFile("mesh.mail"));
}
!
private final static synchronized DunesInterface lecture(File _f)
{
DunesInterface t = null;
! FileReader in=null;
try
{
assertNotNull(_f);
! in=new FileReader(_f);
! DodicoIOAnalyse a = new DunesReader(in).read();
! assertNull(a.getErrors());
! assertNull(a.getWarnings());
! assertNull(a.getInfos());
! t=(DunesInterface)a.getSource();
}
catch (IOException _e)
--- 37,61 ----
double eps_;
DunesInterface t_;
!
public TestDunes()
{
! eps_ = 1E-15;
! t_ = lecture(getFile("mesh.mail"));
}
!
private final static synchronized DunesInterface lecture(File _f)
{
DunesInterface t = null;
! FileReader in = null;
try
{
assertNotNull(_f);
! in = new FileReader(_f);
! DunesReader r = new DunesReader();
! r.setIn(in);
! r.read();
! t = r.getDunesInterface();
! DodicoIOAnalyze a = r.getAnalyze();
! assertNull(a);
}
catch (IOException _e)
***************
*** 66,142 ****
try
{
! if(in!=null) in.close();
}
! catch(IOException e)
{
System.err.println("Impossible de fermer le flux");
e.printStackTrace();
}
!
}
return t;
}
!
private synchronized void communTest(DunesInterface _t)
{
assertNotNull(_t);
! double[] adapt=_t.getAdaptatifValeur();
! int temp=adapt.length;
assertEquals(temp, 9);
! assertEquals(adapt[0] , 0.1d,eps_);
! assertEquals(adapt[1] , 1d,eps_);
! assertEquals(adapt[2] , 1d,eps_);
! assertEquals(adapt[3] , 1d,eps_);
! assertEquals(adapt[4] , 0.1d,eps_);
! assertEquals(adapt[5] , 0.01d,eps_);
! assertEquals(adapt[6] , 0.01d,eps_);
! assertEquals(adapt[7] , 1d,eps_);
! assertEquals(adapt[8] , 1d,eps_);
assertNotNull(_t.getMaillage());
! SPoint[] pts=_t.getMaillage().points;
! temp=pts.length;
assertEquals(temp, 9);
! SPoint pt=pts[0];
! assertEquals(pt.x, 0d,eps_);
! assertEquals(pt.y, 0d,eps_);
! assertEquals(pt.z, 0.25,eps_);
! pt=pts[4];
! assertEquals(pt.x, 0d,eps_);
! assertEquals(pt.y, 3d,eps_);
! assertEquals(pt.z, 0.25,eps_);
! pt=pts[8];
! assertEquals(pt.x, 2d,eps_);
! assertEquals(pt.y, 1d,eps_);
! assertEquals(pt.z, 0.1,eps_);
! int[][] elems=_t.getMaillage().elements;
! temp=elems.length;
assertEquals(temp, 9);
! int[] indices=elems[1];
! temp=indices.length;
assertEquals(temp, 3);
! assertEquals(indices[0],5);
! assertEquals(indices[1],1);
! assertEquals(indices[2],6);
! indices=elems[6];
! temp=indices.length;
assertEquals(temp, 3);
! assertEquals(indices[0],5);
! assertEquals(indices[1],6);
! assertEquals(indices[2],7);
}
public void testLecture()
{
! communTest(t_);
}
!
public void testEcriture()
{
! File tFile=null;
try
{
! tFile=File.createTempFile("temp", ".mail");
}
! catch(IOException e)
{
e.printStackTrace();
--- 67,144 ----
try
{
! if (in != null)
! in.close();
}
! catch (IOException e)
{
System.err.println("Impossible de fermer le flux");
e.printStackTrace();
}
!
}
return t;
}
!
private synchronized void communTest(DunesInterface _t)
{
assertNotNull(_t);
! double[] adapt = _t.getAdaptatifValeur();
! int temp = adapt.length;
assertEquals(temp, 9);
! assertEquals(adapt[0], 0.1d, eps_);
! assertEquals(adapt[1], 1d, eps_);
! assertEquals(adapt[2], 1d, eps_);
! assertEquals(adapt[3], 1d, eps_);
! assertEquals(adapt[4], 0.1d, eps_);
! assertEquals(adapt[5], 0.01d, eps_);
! assertEquals(adapt[6], 0.01d, eps_);
! assertEquals(adapt[7], 1d, eps_);
! assertEquals(adapt[8], 1d, eps_);
assertNotNull(_t.getMaillage());
! SPoint[] pts = _t.getMaillage().points;
! temp = pts.length;
assertEquals(temp, 9);
! SPoint pt = pts[0];
! assertEquals(pt.x, 0d, eps_);
! assertEquals(pt.y, 0d, eps_);
! assertEquals(pt.z, 0.25, eps_);
! pt = pts[4];
! assertEquals(pt.x, 0d, eps_);
! assertEquals(pt.y, 3d, eps_);
! assertEquals(pt.z, 0.25, eps_);
! pt = pts[8];
! assertEquals(pt.x, 2d, eps_);
! assertEquals(pt.y, 1d, eps_);
! assertEquals(pt.z, 0.1, eps_);
! int[][] elems = _t.getMaillage().elements;
! temp = elems.length;
assertEquals(temp, 9);
! int[] indices = elems[1];
! temp = indices.length;
assertEquals(temp, 3);
! assertEquals(indices[0], 5);
! assertEquals(indices[1], 1);
! assertEquals(indices[2], 6);
! indices = elems[6];
! temp = indices.length;
assertEquals(temp, 3);
! assertEquals(indices[0], 5);
! assertEquals(indices[1], 6);
! assertEquals(indices[2], 7);
}
public void testLecture()
{
! communTest(t_);
}
!
public void testEcriture()
{
! File tFile = null;
try
{
! tFile = File.createTempFile("temp", ".mail");
}
! catch (IOException e)
{
e.printStackTrace();
***************
*** 144,156 ****
assertNotNull(tFile);
tFile.deleteOnExit();
! DunesWriter out=null;
! boolean ecrit=false;
try
{
! out=new DunesWriter(new FileWriter(tFile),t_);
out.write();
! ecrit=true;
}
! catch(IOException io)
{
io.printStackTrace();
--- 146,160 ----
assertNotNull(tFile);
tFile.deleteOnExit();
! DunesWriter out = null;
! boolean ecrit = false;
try
{
! out = new DunesWriter();
! out.setOut(new FileWriter(tFile));
! out.setDunesInterface(t_);
out.write();
! ecrit = true;
}
! catch (IOException io)
{
io.printStackTrace();
***************
*** 158,177 ****
finally
{
! try
! {
! if(out!=null) out.close();
! }
! catch(IOException io)
{
! System.err.println("Impossible de fermer le flux");
! io.printStackTrace();
}
}
assertTrue(ecrit);
! communTest(lecture(tFile));
}
!
!
!
private File getFile(String _f)
{
--- 162,178 ----
finally
{
!
! if (out != null)
{
! IOException[] exs = out.close();
! if (exs != null)
! System.err.println("Impossible de fermer le flux");
}
+
}
assertTrue(ecrit);
! communTest(lecture(tFile));
}
!
private File getFile(String _f)
{
***************
*** 192,235 ****
{
System.err.println("Usage: -file=monFichier.mail -out=monFichierReecrit");
}
File f = new File(fileName);
if (!f.exists())
System.err.println("Fichier inexistant " + f.getAbsolutePath());
! DunesReader r=null;
! DunesInterface inter=null;
! ProgressionBuAdapter progress=new ProgressionBuAdapter(new BuTask());
try
{
! r = new DunesReader(new FileReader(f));
r.setProgressReceiver(progress);
! DodicoIOAnalyse infos = r.read();
! if(infos.isError())
{
System.err.println("Attention erreur");
}
! DodicoIOAnalyse.Field[] t=infos.getErrors();
! if(t!=null)
{
System.out.println("+ erreurs");
DodicoLib.printObject(t, true);
}
!
! t=infos.getWarnings();
! if(t!=null)
{
System.out.println("+ warnings");
DodicoLib.printObject(t, true);
}
!
! t=infos.getInfos();
! if(t!=null)
{
System.out.println("+ infos");
DodicoLib.printObject(t, true);
}
!
! if(infos.getSource()!=null)
{
! inter=(DunesInterface)infos.getSource();
System.out.println("+ source");
DodicoLib.printFields(inter, true);
--- 193,243 ----
{
System.err.println("Usage: -file=monFichier.mail -out=monFichierReecrit");
+ return;
}
File f = new File(fileName);
if (!f.exists())
+ {
System.err.println("Fichier inexistant " + f.getAbsolutePath());
! return;
! }
! DunesReader r = null;
! DunesInterface inter = null;
! ProgressionBuAdapter progress = new ProgressionBuAdapter(new BuTask());
try
{
! r = new DunesReader();
! r.setIn(new FileReader(f));
r.setProgressReceiver(progress);
! r.read();
! inter = r.getDunesInterface();
! DodicoIOAnalyze infos = r.getAnalyze();
! if (infos.containsErrors())
{
System.err.println("Attention erreur");
}
! DodicoIOAnalyze.Field[] t = infos.getErrors();
! if (t != null)
{
System.out.println("+ erreurs");
DodicoLib.printObject(t, true);
}
!
! t = infos.getWarnings();
! if (t != null)
{
System.out.println("+ warnings");
DodicoLib.printObject(t, true);
}
!
! t = infos.getInfos();
! if (t != null)
{
System.out.println("+ infos");
DodicoLib.printObject(t, true);
}
!
! if (inter != null)
{
!
System.out.println("+ source");
DodicoLib.printFields(inter, true);
***************
*** 237,241 ****
}
else
! System.out.println("Attention Pas de source");
}
catch (IOException e)
--- 245,249 ----
}
else
! System.out.println("Attention Pas de source");
}
catch (IOException e)
***************
*** 243,279 ****
e.printStackTrace();
}
!
finally
{
! try
! {
! if (r != null)
! r.close();
! }
! catch (IOException e)
{
! System.err.println("Impossible de fermer le flux");
! e.printStackTrace();
}
}
fileName = (String) arg.get("-out");
! if(fileName==null)
{
System.err.println("pas de sortie");
! return;
}
! File out=new File(fileName);
! if(out.exists())
{
System.err.println("Le fichier existe déja :opération annulée");
return;
}
! DunesWriter w=null;
try
{
! w=new DunesWriter(new FileWriter(out),inter,progress);
w.write();
}
! catch(IOException io)
{
io.printStackTrace();
--- 251,286 ----
e.printStackTrace();
}
!
finally
{
! if (r != null)
{
! IOException[] exs = r.close();
! if (exs != null)
! System.err.println("Impossible de fermer le flux");
}
}
fileName = (String) arg.get("-out");
! if (fileName == null)
{
System.err.println("pas de sortie");
! return;
}
! File out = new File(fileName);
! if (out.exists())
{
System.err.println("Le fichier existe déja :opération annulée");
return;
}
! DunesWriter w = null;
try
{
! w = new DunesWriter();
! w.setOut(new FileWriter(out));
! w.setProgressReceiver(progress);
! w.setDunesInterface(inter);
w.write();
}
! catch (IOException io)
{
io.printStackTrace();
***************
*** 281,298 ****
finally
{
! try
! {
! if(w!=null) w.close();
! }
! catch(IOException io)
{
! System.err.println("Impossible de fermer le flux");
! io.printStackTrace();
}
}
-
-
-
-
}
--- 288,298 ----
finally
{
! if (w != null)
{
! IOException[] exs = w.close();
! if (exs != null)
! System.err.println("Impossible de fermer le flux");
}
}
}
|
