Menu
▾
▴
fudaa-cvs-commit
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv5355/test/reflux
Modified Files:
TestCorEleBth.java TestDunes.java TestINP.java
Added Files:
TestRefluxParametres.java
Log Message:
Creation des dossiers h2d/reflux et h2d/telemac et deplacement des
fichiers concerne.
Gestion des cl et des bords ( a refaire ..)
Amelioration des gestions des versions de fichiers
--- NEW FILE: TestRefluxParametres.java ---
(This appears to be a binary file; contents omitted.)
Index: TestCorEleBth.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestCorEleBth.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestCorEleBth.java 18 Aug 2003 11:05:20 -0000 1.7
--- TestCorEleBth.java 22 Aug 2003 15:51:13 -0000 1.8
***************
*** 18,21 ****
--- 18,22 ----
import org.fudaa.dodico.h2d.H2dElement;
import org.fudaa.dodico.h2d.H2dMaillage;
+ import org.fudaa.dodico.h2d.type.H2dElementType;
import org.fudaa.dodico.reflux.io.CorEleBthFileFormat;
import org.fudaa.dodico.reflux.io.CorEleBthInterface;
***************
*** 40,44 ****
H2dMaillage maill= t.getMaillage();
assertNotNull(maill);
! assertEquals(maill.getEltType(), H2dElement.T6);
//H2dPoint[] pts= maill.getPts();
assertEquals(maill.getPtsNb(), 1791);
--- 41,45 ----
H2dMaillage maill= t.getMaillage();
assertNotNull(maill);
! assertEquals(maill.getEltType(), H2dElementType.T6);
//H2dPoint[] pts= maill.getPts();
assertEquals(maill.getPtsNb(), 1791);
***************
*** 136,145 ****
CorEleBthInterface t= null;
reader=
! CorEleBthFileFormat.getInstance().getLastVersionImpl().createReader();
reader.setIn(cor, ele, bth);
reader.setProgressReceiver(new ProgressionBuAdapter(null));
! FileOperationSynthese op= new FileOperationSynthese();
! t= reader.read(op);
! DodicoAnalyze analyse= op.getAnalyze();
printAnalyze("FICHIERS cor,ele,bth", analyse);
H2dMaillage mail= t.getMaillage();
--- 137,146 ----
CorEleBthInterface t= null;
reader=
! CorEleBthFileFormat.getInstance().getLastVersionImpl().createCorEleBthReader();
reader.setIn(cor, ele, bth);
reader.setProgressReceiver(new ProgressionBuAdapter(null));
! FileOperationSynthese op= reader.read();
! t= (CorEleBthInterface)op.getSource();
! DodicoAnalyze analyse= op.getAnalyze().toAnalyze();
printAnalyze("FICHIERS cor,ele,bth", analyse);
H2dMaillage mail= t.getMaillage();
***************
*** 169,179 ****
}
CorEleBthWriter w= null;
! w= CorEleBthFileFormat.getInstance().getLastVersionImpl().createWriter();
w.setFile(corOut, eleOut, bthOut);
w.setProgressReceiver(new ProgressionBuAdapter(null));
- FileOperationSynthese opW= new FileOperationSynthese();
- w.write(t, opW);
System.out.println("Ecriture");
! printAnalyze("FICHIER", opW.getAnalyze());
}
--- 170,178 ----
}
CorEleBthWriter w= null;
! w= CorEleBthFileFormat.getInstance().getLastVersionImpl().createCorEleBthWriter();
w.setFile(corOut, eleOut, bthOut);
w.setProgressReceiver(new ProgressionBuAdapter(null));
System.out.println("Ecriture");
! printAnalyze("FICHIER", w.write(t).getAnalyze().toAnalyze());
}
***************
*** 190,194 ****
inter,
null);
! assertNull(syntheseR.getAnalyze());
_interfaceTest(getInter(tmpFile));
--- 189,193 ----
inter,
null);
! assertNull(syntheseR.getAnalyze().toAnalyze());
_interfaceTest(getInter(tmpFile));
***************
*** 196,204 ****
public CorEleBthInterface getInter(File _f) {
! FileOperationSynthese syntheseR= new FileOperationSynthese();
! CorEleBthInterface r=
! CorEleBthFileFormat.getInstance().getLastVersionImpl().read(_f, syntheseR, null);
! assertNull(syntheseR.getAnalyze());
! return r;
}
--- 195,202 ----
public CorEleBthInterface getInter(File _f) {
! FileOperationSynthese syntheseR=
! CorEleBthFileFormat.getInstance().getLastVersionImpl().read(_f, null);
! assertNull(syntheseR.getAnalyze().toAnalyze());
! return (CorEleBthInterface)syntheseR.getSource();
}
Index: TestDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestDunes.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestDunes.java 18 Aug 2003 11:05:20 -0000 1.8
--- TestDunes.java 22 Aug 2003 15:51:13 -0000 1.9
***************
*** 29,46 ****
* @version $Id$
*/
! public class TestDunes extends TestIO
! {
! public TestDunes()
! {
super("mesh.mail");
! }
! public synchronized void _interfaceTest(DunesInterface _inter)
! {
assertNotNull(_inter);
! DunesInterface t=_inter;
! double[] adapt = t.getAdaptatifValeur();
! int temp = adapt.length;
assertEquals(temp, 9);
assertEquals(adapt[0], 0.1d, eps_);
--- 29,43 ----
* @version $Id$
*/
! public class TestDunes extends TestIO {
! public TestDunes() {
super("mesh.mail");
! }
! public synchronized void _interfaceTest(DunesInterface _inter) {
assertNotNull(_inter);
! DunesInterface t= _inter;
! double[] adapt= t.getAdaptatifValeur();
! int temp= adapt.length;
assertEquals(temp, 9);
assertEquals(adapt[0], 0.1d, eps_);
***************
*** 54,83 ****
assertEquals(adapt[8], 1d, eps_);
assertNotNull(t.getMaillage());
! H2dMaillage m=t.getMaillage();
! temp = m.getPtsNb();
assertEquals(temp, 9);
! H2dPoint pt = m.getPt(0);
assertEquals(pt.getX(), 0d, eps_);
assertEquals(pt.getY(), 0d, eps_);
assertEquals(pt.getZ(), 0.25, eps_);
! pt =m.getPt(4);
assertEquals(pt.getX(), 0d, eps_);
assertEquals(pt.getY(), 3d, eps_);
assertEquals(pt.getZ(), 0.25, eps_);
! pt = m.getPt(8);
assertEquals(pt.getX(), 2d, eps_);
assertEquals(pt.getY(), 1d, eps_);
assertEquals(pt.getZ(), 0.1, eps_);
//H2dElement[] elems = t.getMaillage().getElts();
! temp = t.getMaillage().getEltNb();
assertEquals(temp, 9);
! int[] indices = t.getMaillage().getElement(1).getPtIndex();
! temp = indices.length;
assertEquals(temp, 3);
assertEquals(indices[0], 4);
assertEquals(indices[1], 0);
assertEquals(indices[2], 5);
! indices = t.getMaillage().getElement(6).getPtIndex();
! temp = indices.length;
assertEquals(temp, 3);
assertEquals(indices[0], 4);
--- 51,80 ----
assertEquals(adapt[8], 1d, eps_);
assertNotNull(t.getMaillage());
! H2dMaillage m= t.getMaillage();
! temp= m.getPtsNb();
assertEquals(temp, 9);
! H2dPoint pt= m.getPt(0);
assertEquals(pt.getX(), 0d, eps_);
assertEquals(pt.getY(), 0d, eps_);
assertEquals(pt.getZ(), 0.25, eps_);
! pt= m.getPt(4);
assertEquals(pt.getX(), 0d, eps_);
assertEquals(pt.getY(), 3d, eps_);
assertEquals(pt.getZ(), 0.25, eps_);
! pt= m.getPt(8);
assertEquals(pt.getX(), 2d, eps_);
assertEquals(pt.getY(), 1d, eps_);
assertEquals(pt.getZ(), 0.1, eps_);
//H2dElement[] elems = t.getMaillage().getElts();
! temp= t.getMaillage().getEltNb();
assertEquals(temp, 9);
! int[] indices= t.getMaillage().getElement(1).getPtIndex();
! temp= indices.length;
assertEquals(temp, 3);
assertEquals(indices[0], 4);
assertEquals(indices[1], 0);
assertEquals(indices[2], 5);
! indices= t.getMaillage().getElement(6).getPtIndex();
! temp= indices.length;
assertEquals(temp, 3);
assertEquals(indices[0], 4);
***************
*** 85,159 ****
assertEquals(indices[2], 6);
}
!
/**
*
*/
! public void testEcriture()
! {
! DunesInterface inter=getInter(fic_);
! File tmpFile=createTempFile();
! FileOperationSynthese syntheseR=DunesFileFormat.getInstance().getLastVersionImpl().write(tmpFile, inter, null);
! assertNull(syntheseR.getAnalyze());
! _interfaceTest(getInter(tmpFile));
!
! }
!
! public static DunesInterface getInter(File _f)
! {
! FileOperationSynthese syntheseR= new FileOperationSynthese();
! DunesInterface r=DunesFileFormat.getInstance().getLastVersionImpl().read(_f, syntheseR, null);
! assertNull(syntheseR.getAnalyze());
! if(syntheseR.containsMessages())
! syntheseR.getAnalyze().printResume();
! return r;
! }
! /**
! *
! */
! public void testLecture()
! {
! _interfaceTest(getInter(fic_));
! }
! 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;
}
! ProgressionBuAdapter progress = new ProgressionBuAdapter(new BuTask());
! FileOperationSynthese op=new FileOperationSynthese();
! DunesInterface inter = DunesFileFormat.getInstance().getLastVersionImpl().read(f, op, progress);
! if(op.containsMessages()) op.getAnalyze().printResume();
! 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;
}
! FileOperationSynthese opw=DunesFileFormat.getInstance().getLastVersionImpl().write(out, inter, progress);
! if(opw.containsMessages()) opw.getAnalyze().printResume();
}
--- 82,158 ----
assertEquals(indices[2], 6);
}
!
/**
*
*/
! public void testEcriture() {
! DunesInterface inter= getInter(fic_);
! File tmpFile= createTempFile();
! FileOperationSynthese syntheseR=
! DunesFileFormat.getInstance().getLastVersionImpl().write(
! tmpFile,
! inter,
! null);
! assertNull(syntheseR.getAnalyze().toAnalyze());
! _interfaceTest(getInter(tmpFile));
! }
! public static DunesInterface getInter(File _f) {
! FileOperationSynthese syntheseR=
! DunesFileFormat.getInstance().getLastVersionImpl().read(_f, null);
! DunesInterface r= (DunesInterface)syntheseR.getSource();
! assertNull(syntheseR.getAnalyze().toAnalyze());
! if (syntheseR.containsMessages())
! syntheseR.getAnalyze().toAnalyze().printResume();
! return r;
! }
+ /**
+ *
+ */
+ public void testLecture() {
+ _interfaceTest(getInter(fic_));
+ }
! 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;
}
! ProgressionBuAdapter progress= new ProgressionBuAdapter(new BuTask());
! FileOperationSynthese op=
! DunesFileFormat.getInstance().getLastVersionImpl().read(f, progress);
! DunesInterface inter= (DunesInterface)op.getSource();
! if (op.containsMessages())
! op.getAnalyze().toAnalyze().printResume();
! 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;
}
! FileOperationSynthese opw=
! DunesFileFormat.getInstance().getLastVersionImpl().write(
! out,
! inter,
! progress);
! if (opw.containsMessages())
! opw.getAnalyze().toAnalyze().printResume();
}
Index: TestINP.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestINP.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestINP.java 18 Aug 2003 11:05:20 -0000 1.6
--- TestINP.java 22 Aug 2003 15:51:13 -0000 1.7
***************
*** 15,27 ****
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
- import org.fudaa.dodico.h2d.H2dConditionLimiteReflux;
- import org.fudaa.dodico.h2d.H2dElement;
import org.fudaa.dodico.h2d.H2dGroupePasTemps;
import org.fudaa.dodico.h2d.H2dMaillage;
import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dProprieteElementaire;
- import org.fudaa.dodico.h2d.H2dRefluxDicoModel;
import org.fudaa.dodico.h2d.type.H2dBordType;
import org.fudaa.dodico.h2d.type.H2dClType;
--- 15,26 ----
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
+ import org.fudaa.dodico.commun.ProgressionTestAdapter;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
import org.fudaa.dodico.h2d.H2dGroupePasTemps;
import org.fudaa.dodico.h2d.H2dMaillage;
+ import org.fudaa.dodico.h2d.H2dMaillageFrontiere;
import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dProprieteElementaire;
import org.fudaa.dodico.h2d.type.H2dBordType;
import org.fudaa.dodico.h2d.type.H2dClType;
***************
*** 30,33 ****
--- 29,36 ----
import org.fudaa.dodico.h2d.type.H2dSchemaResolutionType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
+ import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral;
+ import org.fudaa.dodico.h2d.reflux.H2dRefluxBordManager;
+ import org.fudaa.dodico.h2d.reflux.H2dRefluxConditionLimite;
+ import org.fudaa.dodico.h2d.reflux.H2dRefluxParametres;
import org.fudaa.dodico.reflux.io.INPFileFormat;
import org.fudaa.dodico.reflux.io.INPInterface;
***************
*** 39,110 ****
* @version $Id$
*/
! public class TestINP extends TestIO
! {
! public TestINP()
! {
super("canal_s.inp");
}
!
!
/**
* @see org.fudaa.dodico.test.TestIO#_interfaceTest(TrFileReadView)
*/
! public void _interfaceTest(INPInterface _t)
! {
! INPFileFormat.INPVersion version=INPFileFormat.getInstance().getLastINPVersionImpl();
! INPInterface t=_t;
assertTrue("5.0".equals(t.getVersion()));
assertEquals(t.getTypeProjet(), H2dProjetType.COURANTOLOGIE_2D);
assertNotNull(t.getEntiteValue());
! assertTrue(t.getEntiteValue().containsKey(version.getDico().getEntite("ITERATION")));
! H2dMaillage m=t.getMaillage();
assertEquals(m.getPtsNb(), 1791);
! H2dPoint pt=m.getPt(1790);
! assertEquals(pt.getX(), 1000,eps_);
! assertEquals(pt.getY(), 10,eps_);
! assertEquals(pt.getZ(), 12,eps_);
! pt=m.getPt(1770);
! assertEquals(pt.getX(), 989.898987,eps_);
! assertEquals(pt.getY(), 7.5,eps_);
! assertEquals(pt.getZ(), 12.030303,eps_);
! int[] itemp=t.getPtsExtremitesElement();
! assertNotNull("Les points frontiere ne sont pas nuls",itemp);
! assertEquals(itemp[5], 18);
! assertEquals(itemp[499],1790);
! H2dConditionLimiteReflux[] tabCl=t.getConditionLimite();
!
! H2dConditionLimiteReflux cl=getForIndex(tabCl, 818);
assertEquals(cl.getUType(), H2dClType.PERMANENT);
! assertEquals(cl.getU(),0,eps_);
!
! cl=getForIndex(tabCl, 1790);
assertEquals(cl.getVType(), H2dClType.PERMANENT);
! assertEquals(cl.getV(),0,eps_);
! assertEquals(cl.getNormale(), 0,eps_);
assertEquals(cl.getHType(), H2dClType.PERMANENT);
! assertEquals(cl.getH(),13.3,eps_);
!
! cl=getForIndex(tabCl, 1781);
! assertEquals(cl.getNormale(), 90.0000041,eps_);
!
! cl=getForIndex(tabCl, 0);
assertEquals(cl.getHType(), H2dClType.PERMANENT);
! assertEquals(cl.getH(),16.325,eps_);
!
! itemp=new int[]{1430,1421,1412,1403,1394};
!
! for(int i=itemp.length-1;i>0;i--)
! {
! cl=getForIndex(tabCl, itemp[i]);
! assertEquals(H2dBordType.SOLIDE,cl.getBordType());
! assertEquals(H2dClType.PERMANENT,cl.getRugositeType());
! assertEquals(3d,cl.getRugosite(),eps_);
!
}
!
!
//H2dElement[] elems=t.getMaillage().getElts();
assertEquals(t.getMaillage().getEltNb(), 792);
! itemp=t.getMaillage().getElement(791).getPtIndex();
assertEquals(itemp[0], 1788);
assertEquals(itemp[1], 1789);
--- 42,114 ----
* @version $Id$
*/
! public class TestINP extends TestIO {
! public TestINP() {
super("canal_s.inp");
}
!
/**
* @see org.fudaa.dodico.test.TestIO#_interfaceTest(TrFileReadView)
*/
! public void _interfaceTest(INPInterface _t) {
! INPFileFormat.INPVersion version=
! INPFileFormat.getInstance().getLastINPVersionImpl();
! INPInterface t= _t;
assertTrue("5.0".equals(t.getVersion()));
assertEquals(t.getTypeProjet(), H2dProjetType.COURANTOLOGIE_2D);
assertNotNull(t.getEntiteValue());
! assertTrue(
! t.getEntiteValue().containsKey(version.getDico().getEntite("ITERATION")));
! H2dMaillage m= t.getMaillage();
assertEquals(m.getPtsNb(), 1791);
! H2dPoint pt= m.getPt(1790);
! assertEquals(pt.getX(), 1000, eps_);
! assertEquals(pt.getY(), 10, eps_);
! assertEquals(pt.getZ(), 12, eps_);
! pt= m.getPt(1770);
! assertEquals(pt.getX(), 989.898987, eps_);
! assertEquals(pt.getY(), 7.5, eps_);
! assertEquals(pt.getZ(), 12.030303, eps_);
! int[] itemp;
! // int[] itemp=t.getPtsExtremitesElement();
! // assertNotNull("Les points frontiere ne sont pas nuls",itemp);
! // assertEquals(itemp[5], 18);
! // assertEquals(itemp[499],1790);
! H2dRefluxConditionLimite[] tabCl= t.getConditionLimite();
!
! H2dRefluxConditionLimite cl= getForIndex(tabCl, 818);
assertEquals(cl.getUType(), H2dClType.PERMANENT);
! assertEquals(cl.getU(), 0, eps_);
!
! cl= getForIndex(tabCl, 1790);
assertEquals(cl.getVType(), H2dClType.PERMANENT);
! assertEquals(cl.getV(), 0, eps_);
! assertEquals(cl.getNormale(), 0, eps_);
assertEquals(cl.getHType(), H2dClType.PERMANENT);
! assertEquals(cl.getH(), 13.3, eps_);
!
! cl= getForIndex(tabCl, 1781);
! assertEquals(cl.getNormale(), 90.0000041, eps_);
!
! cl= getForIndex(tabCl, 0);
assertEquals(cl.getHType(), H2dClType.PERMANENT);
! assertEquals(cl.getH(), 16.325, eps_);
!
! H2dRefluxBordIndexGeneral bord=
! H2dRefluxBordIndexGeneral.findBordWithIndex(1430, 1421, _t.getBords());
! assertEquals(H2dBordType.SOLIDE, bord.getBord());
! bord=
! H2dRefluxBordIndexGeneral.findBordWithIndex(1412, 1403, _t.getBords());
! assertEquals(H2dBordType.SOLIDE, bord.getBord());
! itemp= new int[] { 1430, 1421, 1412, 1403, 1394 };
! for (int i= itemp.length - 1; i > 0; i--) {
! cl= getForIndex(tabCl, itemp[i]);
! assertEquals(H2dClType.PERMANENT, cl.getRugositeType());
! assertEquals(3d, cl.getRugosite(), eps_);
!
}
!
//H2dElement[] elems=t.getMaillage().getElts();
assertEquals(t.getMaillage().getEltNb(), 792);
! itemp= t.getMaillage().getElement(791).getPtIndex();
assertEquals(itemp[0], 1788);
assertEquals(itemp[1], 1789);
***************
*** 113,153 ****
assertEquals(itemp[4], 1770);
assertEquals(itemp[5], 1779);
!
! H2dProprieteElementaire[] propelem=t.getPropElementaires();
! H2dProprieteElementaire prTemp=propelem[0];
assertEquals(prTemp.getVariableType(), H2dVariableType.VISCOSITE);
assertEquals(prTemp.getValeurTransitoireNb(), 0);
assertEquals(prTemp.getPermanentNb(), 0);
assertEquals(prTemp.getValeurLibreNb(), 0);
! assertEquals(prTemp.getDefaultValue(),0.01,eps_);
! prTemp=propelem[1];
assertEquals(prTemp.getVariableType(), H2dVariableType.RUGOSITE);
assertEquals(prTemp.getValeurTransitoireNb(), 0);
assertEquals(prTemp.getPermanentNb(), 0);
assertEquals(prTemp.getValeurLibreNb(), 0);
! assertEquals(prTemp.getDefaultValue(),0.025,eps_);
! prTemp=propelem[2];
! assertEquals(prTemp.getVariableType(), H2dVariableType.ALPHA_LONGUEUR_MELANGE);
assertEquals(prTemp.getValeurTransitoireNb(), 0);
assertEquals(prTemp.getPermanentNb(), 0);
assertEquals(prTemp.getValeurLibreNb(), 0);
! assertEquals(prTemp.getDefaultValue(),0.0,eps_);
!
! prTemp=propelem[3];
assertEquals(prTemp.getVariableType(), H2dVariableType.PERTE_CHARGE);
assertEquals(prTemp.getValeurTransitoireNb(), 0);
assertEquals(prTemp.getPermanentNb(), 792);
assertEquals(prTemp.getValeurLibreNb(), 0);
! assertEquals(prTemp.getDefaultValue(),0.0,eps_);
!
! for(int i=790;i>=0;i--)
! {
! if(i!=758)
! assertEquals(prTemp.getPermanentValueForIndex(i), 0.0,eps_);
else
! assertEquals(prTemp.getPermanentValueForIndex(i), 0.01,eps_);
}
! String[] fics=t.getFichiers();
assertEquals(fics.length, 3);
assertEquals(fics[0], "canal_s.siv");
--- 117,158 ----
assertEquals(itemp[4], 1770);
assertEquals(itemp[5], 1779);
!
! H2dProprieteElementaire[] propelem= t.getPropElementaires();
! H2dProprieteElementaire prTemp= propelem[0];
assertEquals(prTemp.getVariableType(), H2dVariableType.VISCOSITE);
assertEquals(prTemp.getValeurTransitoireNb(), 0);
assertEquals(prTemp.getPermanentNb(), 0);
assertEquals(prTemp.getValeurLibreNb(), 0);
! assertEquals(prTemp.getDefaultValue(), 0.01, eps_);
! prTemp= propelem[1];
assertEquals(prTemp.getVariableType(), H2dVariableType.RUGOSITE);
assertEquals(prTemp.getValeurTransitoireNb(), 0);
assertEquals(prTemp.getPermanentNb(), 0);
assertEquals(prTemp.getValeurLibreNb(), 0);
! assertEquals(prTemp.getDefaultValue(), 0.025, eps_);
! prTemp= propelem[2];
! assertEquals(
! prTemp.getVariableType(),
! H2dVariableType.ALPHA_LONGUEUR_MELANGE);
assertEquals(prTemp.getValeurTransitoireNb(), 0);
assertEquals(prTemp.getPermanentNb(), 0);
assertEquals(prTemp.getValeurLibreNb(), 0);
! assertEquals(prTemp.getDefaultValue(), 0.0, eps_);
!
! prTemp= propelem[3];
assertEquals(prTemp.getVariableType(), H2dVariableType.PERTE_CHARGE);
assertEquals(prTemp.getValeurTransitoireNb(), 0);
assertEquals(prTemp.getPermanentNb(), 792);
assertEquals(prTemp.getValeurLibreNb(), 0);
! assertEquals(prTemp.getDefaultValue(), 0.0, eps_);
!
! for (int i= 790; i >= 0; i--) {
! if (i != 758)
! assertEquals(prTemp.getPermanentValueForIndex(i), 0.0, eps_);
else
! assertEquals(prTemp.getPermanentValueForIndex(i), 0.01, eps_);
}
! String[] fics= t.getFichiers();
assertEquals(fics.length, 3);
assertEquals(fics[0], "canal_s.siv");
***************
*** 157,213 ****
assertFalse(t.contientSollicitationsReparties());
assertFalse(t.contientVent());
!
! H2dGroupePasTemps[] gts=t.getGroupePasTemps();
assertNotNull(gts);
assertEquals(gts.length, 1);
! H2dGroupePasTemps gt=gts[0];
assertNotNull(gt);
assertEquals(gt.getNbPasTemps(), 1);
assertEquals(gt.getSchema(), H2dSchemaResolutionType.STATIONNAIRE);
assertEquals(gt.getMethode(), H2dMethodeResolutionType.SELECT_LUMPING);
! assertEquals(gt.getRelaxation(), 1,eps_);
! assertEquals(gt.getPrecision(), 0.001,eps_);
! assertEquals(gt.getPrecisionBancCouvrantDecouvrant(), 0.05,eps_);
assertEquals(gt.getNombreIterationMax(), 2);
! Map dtemp=t.getEntiteValue();
assertNotNull(dtemp);
! for(int i=8;i>=0;i--)
! {
! DicoEntite ent=version.getCoefContribution(i);
assertNotNull(ent);
! assertEquals(Double.parseDouble((String)dtemp.get(ent)) , i,eps_);
}
}
!
! private H2dConditionLimiteReflux getForIndex(H2dConditionLimiteReflux[] _tab,int _index)
! {
! int l=_tab.length-1;
! for(int i=l;i>=0;i--)
! {
! if(_tab[i].getIndexPt()==_index) return _tab[i];
}
return null;
}
!
/**
*
*/
! public void testEcriture()
! {
! // CorEleBthInterface inter=getInter(fic_);
! // File tmpFile=createTempFile();
! // FileOperationSynthese syntheseR=CorEleBthFileFormat.getInstance().write(tmpFile, inter, null);
! // assertNull(syntheseR.getAnalyze());
! // _interfaceTest(getInter(tmpFile));
!
! }
! public INPInterface getInter(File _f)
! {
! FileOperationSynthese syntheseR= new FileOperationSynthese();
! INPInterface r=INPFileFormat.getInstance().getLastINPVersionImpl().read(_f, syntheseR, null);
! if(syntheseR.getAnalyze()!=null)
! System.out.println( syntheseR.getAnalyze().getResume());
! assertNull(syntheseR.getAnalyze());
return r;
}
--- 162,217 ----
assertFalse(t.contientSollicitationsReparties());
assertFalse(t.contientVent());
!
! H2dGroupePasTemps[] gts= t.getGroupePasTemps();
assertNotNull(gts);
assertEquals(gts.length, 1);
! H2dGroupePasTemps gt= gts[0];
assertNotNull(gt);
assertEquals(gt.getNbPasTemps(), 1);
assertEquals(gt.getSchema(), H2dSchemaResolutionType.STATIONNAIRE);
assertEquals(gt.getMethode(), H2dMethodeResolutionType.SELECT_LUMPING);
! assertEquals(gt.getRelaxation(), 1, eps_);
! assertEquals(gt.getPrecision(), 0.001, eps_);
! assertEquals(gt.getPrecisionBancCouvrantDecouvrant(), 0.05, eps_);
assertEquals(gt.getNombreIterationMax(), 2);
! Map dtemp= t.getEntiteValue();
assertNotNull(dtemp);
! for (int i= 8; i >= 0; i--) {
! DicoEntite ent= version.getCoefContribution(i);
assertNotNull(ent);
! assertEquals(Double.parseDouble((String)dtemp.get(ent)), i, eps_);
}
}
!
! private H2dRefluxConditionLimite getForIndex(
! H2dRefluxConditionLimite[] _tab,
! int _index) {
! int l= _tab.length - 1;
! for (int i= l; i >= 0; i--) {
! if (_tab[i].getIndexPt() == _index)
! return _tab[i];
}
return null;
}
!
/**
*
*/
! public void testEcriture() {
! // CorEleBthInterface inter=getInter(fic_);
! // File tmpFile=createTempFile();
! // FileOperationSynthese syntheseR=CorEleBthFileFormat.getInstance().write(tmpFile, inter, null);
! // assertNull(syntheseR.getAnalyze());
! // _interfaceTest(getInter(tmpFile));
! }
!
! public INPInterface getInter(File _f) {
! FileOperationSynthese syntheseR=
! INPFileFormat.getInstance().getLastINPVersionImpl().read(_f, null);
! INPInterface r=(INPInterface)syntheseR.getSource();
! if (syntheseR.containsMessages())
! syntheseR.getAnalyze().toAnalyze().printResume();
! assertNull(syntheseR.getAnalyze().toAnalyze());
return r;
}
***************
*** 216,271 ****
*
*/
! public void testLecture()
! {
_interfaceTest(getInter(fic_));
}
!
!
!
!
! 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;
}
! FileOperationSynthese syntheseR= new FileOperationSynthese();
! INPInterface inpInter=INPFileFormat.getInstance().getLastINPVersionImpl().read(f, syntheseR, null);
! DodicoAnalyze infos = syntheseR.getAnalyze();
if (infos != null)
infos.printResume();
! if (inpInter != null)
! {
System.out.println(inpInter.getTypeProjet().toString());
DodicoLib.printFields(inpInter, false);
}
- // try
- // {
- // Thread.currentThread().sleep(10000);
- // }
- // catch(Exception e)
- // {
- // e.printStackTrace();
- // }
}
-
-
}
--- 220,283 ----
*
*/
! public void testLecture() {
_interfaceTest(getInter(fic_));
+ }
+
+ public void testAnalyze() {
+ INPInterface inter= getInter(fic_);
+ DodicoAnalyze.Editor anal= new DodicoAnalyze.Editor();
+ H2dRefluxParametres param=
+ H2dRefluxParametres.init(
+ inter,
+ new ProgressionTestAdapter(),
+ INPFileFormat.getInstance().getLastINPVersionImpl(),
+ anal);
+ assertTrue(anal.isEmpty());
+ assertNull(anal.toAnalyze());
+ H2dMaillageFrontiere maillageBord= param.getMaillage().getPtsFrontiere();
+ int[] pointsFr= maillageBord.getArray();
+ int n= pointsFr.length - 1;
+ for (int i= n; i >= 0; i--) {
+ assertEquals(pointsFr[i], param.getRefluxCL(i).getIndexPt());
+ }
+ assertEquals(1, maillageBord.getBordNb());
+ H2dRefluxBordManager mng= param.getBords();
+ assertEquals(mng.getFrontiereBordNb(), 1);
+ H2dRefluxBordManager.BordParFrontiere frontiere0= mng.getFrontiereBord(0);
+ assertEquals(1, frontiere0.getBordNb());
+ assertTrue(frontiere0.getBord(0).isUnique());
}
! public static void main(String[] args) {
! HashMap arg= DodicoLib.parseArgs(args);
! String fileName= ...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X