Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type H2dBoundaryHouleType.java,NONE,1.1 H2dVariableTypeContainer.java,1.2,1.3 H2dVariableType.java,1.11,1.12 H2dBoundaryType.java,1.4,1.5
|
From: Frederic D. <de...@us...> - 2004-06-11 16:33:22
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv778/src/org/fudaa/dodico/h2d/type Modified Files: H2dVariableTypeContainer.java H2dVariableType.java H2dBoundaryType.java Added Files: H2dBoundaryHouleType.java Log Message: Maj Index: H2dVariableType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableType.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** H2dVariableType.java 5 May 2004 12:38:34 -0000 1.11 --- H2dVariableType.java 11 Jun 2004 16:33:12 -0000 1.12 *************** *** 209,212 **** --- 209,224 ---- } }; + public static final H2dVariableType CONCENTRATION= + new H2dVariableType(20, H2dResource.getS("Concentration"), null) { + public double getValue(H2dVariableTypeContainer _c) { + return _c.getConcentration(); + } + }; + public static final H2dVariableType EVOLUTION_SEDIMENTAIRE= + new H2dVariableType(21, H2dResource.getS("Valeur évolutions sédimentaires"), null) { + public double getValue(H2dVariableTypeContainer _c) { + return _c.getEvolSedimValue(); + } + }; public final static boolean isTracerVariable(H2dVariableType _t) { return (_t == H2dVariableType.TRACEUR) --- NEW FILE: H2dBoundaryHouleType.java --- /** * @creation 1 juin 2004 * @modification $Date: 2004/06/11 16:33:12 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.h2d.type; import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author Fred Deniger * @version $Id: H2dBoundaryHouleType.java,v 1.1 2004/06/11 16:33:12 deniger Exp $ */ public class H2dBoundaryHouleType extends H2dBoundaryType { /** * Bord houle incidente. */ public static H2dBoundaryType LIQUIDE_HOULE_INCIDENCE= new H2dBoundaryType( H2dResource.getS("Liquide houle incidente")); /** * bord sortie libre. */ public static H2dBoundaryType LIQUIDE_SORTIE_LIBRE= new H2dBoundaryType( H2dResource.getS("Liquide sortie libre")); /** * bord houle imposee. */ public static H2dBoundaryType LIQUIDE_HOULE_IMPOSEE= new H2dBoundaryType( H2dResource.getS("Liquide houle imposée")); /** * Tomawac Frontière libre */ public static H2dBoundaryType FRONTIERE_LIBRE= new H2dBoundaryType( H2dResource.getS("Frontière libre")); /** * Tomawac Frontiere a valeurs imposées */ public static H2dBoundaryType FRONTIERE_VALEURS_IMPOSEES= new H2dBoundaryType( H2dResource.getS("Frontière à valeurs imposées")); /** * @param _nom */ public H2dBoundaryHouleType( String _nom) { super(_nom); } /** * @param _nom * @param _isSolide */ public H2dBoundaryHouleType(String _nom, boolean _isSolide) { super(_nom, _isSolide); } } Index: H2dVariableTypeContainer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableTypeContainer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** H2dVariableTypeContainer.java 25 Nov 2003 10:11:37 -0000 1.2 --- H2dVariableTypeContainer.java 11 Jun 2004 16:33:12 -0000 1.3 *************** *** 25,28 **** --- 25,32 ---- */ public double getV(); + public double getConcentration(); + public double getEvolSedimValue(); + + /** * @return tracer Index: H2dBoundaryType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dBoundaryType.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** H2dBoundaryType.java 5 May 2004 12:38:35 -0000 1.4 --- H2dBoundaryType.java 11 Jun 2004 16:33:12 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.h2d.type; + import org.fudaa.dodico.commun.DodicoEnumType; import org.fudaa.dodico.h2d.resource.H2dResource; *************** *** 15,57 **** */ public class H2dBoundaryType extends DodicoEnumType { ! public static H2dBoundaryType MIXTE= ! new H2dBoundaryType(0, H2dResource.getS("Mixte"), true); ! public static H2dBoundaryType SOLIDE= ! new H2dBoundaryType(1, H2dResource.getS("Solide"), true); ! public static H2dBoundaryType SOLIDE_FROTTEMENT= ! new H2dBoundaryType(2, H2dResource.getS("Solide frottement"), true); ! public static H2dBoundaryType LIQUIDE= ! new H2dBoundaryType(3, H2dResource.getS("Liquide")); ! public static H2dBoundaryType LIQUIDE_VITESSES_IMPOSEES= ! new H2dBoundaryType(4, H2dResource.getS("Liquide vitesses imposées")); ! public static H2dBoundaryType LIQUIDE_HAUTEUR_VITESSES_IMPOSEES= ! new H2dBoundaryType( ! 2, ! H2dResource.getS("Liquide hauteur et vitesses imposées")); ! public static H2dBoundaryType LIQUIDE_HAUTEUR_IMPOSEE= ! new H2dBoundaryType(5, H2dResource.getS("Liquide hauteur imposée")); ! public static H2dBoundaryType LIQUIDE_DEBIT_IMPOSE= ! new H2dBoundaryType(6, H2dResource.getS("Liquide débit imposé")); ! public static H2dBoundaryType LIQUIDE_ONDE_INCIDENCE= ! new H2dBoundaryType(7, H2dResource.getS("Liquide onde incidence")); private boolean isLiquide_; /** * */ ! H2dBoundaryType(int _id, String _nom) { ! this(_id, _nom, false); } ! H2dBoundaryType(int _id, String _nom, boolean _isSolide) { ! super(_id, _nom); ! isLiquide_= !_isSolide; } public boolean isLiquide() { return isLiquide_; } public boolean isSolide() { return !isLiquide_; } public boolean equals(H2dBoundaryType _t) { return _t == null ? false : (getId() == _t.getId()); } ! } --- 16,67 ---- */ public class H2dBoundaryType extends DodicoEnumType { ! ! private static int createdIdx_; ! public static H2dBoundaryType MIXTE = new H2dBoundaryType(H2dResource.getS("Mixte"), true); ! public static H2dBoundaryType SOLIDE = new H2dBoundaryType(H2dResource.getS("Solide"), true); ! public static H2dBoundaryType SOLIDE_FROTTEMENT = new H2dBoundaryType(H2dResource ! .getS("Solide frottement"), true); ! public static H2dBoundaryType LIQUIDE = new H2dBoundaryType(H2dResource.getS("Liquide")); ! public static H2dBoundaryType LIQUIDE_VITESSES_IMPOSEES = new H2dBoundaryType(H2dResource ! .getS("Liquide vitesses imposées")); ! public static H2dBoundaryType LIQUIDE_HAUTEUR_VITESSES_IMPOSEES = new H2dBoundaryType(H2dResource ! .getS("Liquide hauteur et vitesses imposées")); ! public static H2dBoundaryType LIQUIDE_HAUTEUR_IMPOSEE = new H2dBoundaryType(H2dResource ! .getS("Liquide hauteur imposée")); ! public static H2dBoundaryType LIQUIDE_DEBIT_IMPOSE = new H2dBoundaryType(H2dResource ! .getS("Liquide débit imposé")); ! public static H2dBoundaryType LIQUIDE_ONDE_INCIDENCE = new H2dBoundaryType(H2dResource ! .getS("Liquide onde incidence")); private boolean isLiquide_; + /** * */ ! protected H2dBoundaryType(String _nom) { ! this(_nom, false); } ! ! protected H2dBoundaryType(String _nom, boolean _isSolide) { ! super(createdIdx_++, _nom); ! isLiquide_ = !_isSolide; } + public boolean isLiquide() { return isLiquide_; } + public boolean isSolide() { return !isLiquide_; } + public boolean equals(H2dBoundaryType _t) { return _t == null ? false : (getId() == _t.getId()); } ! ! public boolean equals(Object _t) { ! if (_t == this) return true; ! else if (_t == null) return false; ! else if (_t instanceof H2dBoundaryType) { return equals((H2dBoundaryType) _t); } ! return false; ! } ! } \ No newline at end of file |
