|
From: <de...@us...> - 2015-03-16 21:26:49
|
Revision: 9072
http://sourceforge.net/p/fudaa/svn/9072
Author: deniger
Date: 2015-03-16 21:26:46 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableType.java
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableType.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableType.java 2015-03-16 16:20:44 UTC (rev 9071)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableType.java 2015-03-16 21:26:46 UTC (rev 9072)
@@ -105,17 +105,36 @@
return "m/s";
}
+ public static final H2dVariableType POINT_X = new H2dVariableType(H2dResource.getS("X"),
+ null, "x") {
+
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return 0;
+ }
+ };
+ public static final H2dVariableType POINT_Y = new H2dVariableType(H2dResource.getS("Y"),
+ null, "y") {
+
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return 0;
+ }
+ };
+
/**
* COEF_FROTTEMENT.
*/
public static final H2dVariableType COEF_FROTTEMENT = new H2dVariableType(H2dResource.getS("Coefficient frottement"),
- null, "frc") {
+ null, "frc") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return _c.getFriction();
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return _c.getFriction();
+ }
+ };
public static final H2dVariableType SANS = new H2dVariableType(H2dResource.getS("Sans"), null, "sans") {
@@ -126,23 +145,23 @@
};
public static final H2dVariableType COEF_DIFFUSION = new H2dVariableType(H2dResource.getS("Coefficient diffusion"),
- null, "dif") {
+ null, "dif") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- new Throwable().printStackTrace();
- return 0;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return 0;
+ }
+ };
public static final H2dVariableType LOI_TARAGE = new H2dVariableType(H2dResource.getS("Loi de tarage"), null,
- "tarage") {
+ "tarage") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- new Throwable().printStackTrace();
- return 0;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return 0;
+ }
+ };
public static final H2dVariableType TEMPS = new H2dVariableType(H2dResource.getS("Temps"), null, "t") {
@@ -157,18 +176,18 @@
}
};
public static final H2dVariableType COEF_FROTTEMENT_FOND = new H2dVariableType(H2dResource
- .getS("Coefficient frottement de fond"), null, "bottom_frc") {
+ .getS("Coefficient frottement de fond"), null, "bottom_frc") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return _c.getFriction();
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return _c.getFriction();
+ }
+ };
/**
* Cote d'eau.
*/
- // public static final H2dVariableType COTE_EAU = new H2dVariableType(H2dResource.getS("Cote eau"), "SL", "zw") {
+ // public static final H2dVariableType COTE_EAU = new H2dVariableType(H2dResource.getS("Cote eau"), "SL", "zw") {
public static final H2dVariableType COTE_EAU = new H2dVariableType(H2dResource.getS("Surface libre"), "SL", "zw") {
@Override
public boolean canBeTransient() {
@@ -188,18 +207,18 @@
};
public static final H2dVariableType DEBIT_M3 = new H2dVariableTypeDebitM3(H2dResource.getS("D\xE9bit") + " m3/s", "Qm3",
- "Qm3") {
+ "Qm3") {
@Override
public boolean canBeTransient() {
return true;
}
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return 0;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return 0;
+ }
+ };
/**
* debit.
@@ -217,23 +236,23 @@
}
};
public static final H2dVariableType DEBIT_NORMAL = new H2dVariableTypeDebit(H2dResource.getS("D\xE9bit normal"), null,
- "qu") {
+ "qu") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- new Throwable().printStackTrace();
- return -1;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return -1;
+ }
+ };
public static final H2dVariableType DEBIT_TANGENTIEL = new H2dVariableTypeDebit(H2dResource.getS("D\xE9bit tangentiel"),
- null, "qv") {
+ null, "qv") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- new Throwable().printStackTrace();
- return -1;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return -1;
+ }
+ };
public static final H2dVariableType DEBIT_X = new H2dVariableTypeDebit(H2dResource.getS("D\xE9bit selon X"), null, "qx") {
@@ -265,21 +284,21 @@
}
};
public static final H2dVariableType PERTE_CHARGE = new H2dVariableType(H2dResource.getS("Perte de charge"), null,
- "frc_loss") {
+ "frc_loss") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return _c.getPressureLoss();
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return _c.getPressureLoss();
+ }
+ };
public static final H2dVariableType PRECISION_BCD_METHOD = new H2dVariableType(
- H2dResource.getS("Pr\xE9cision banc c/d"), null, "acc_bcd_meth") {
+ H2dResource.getS("Pr\xE9cision banc c/d"), null, "acc_bcd_meth") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return 0;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return 0;
+ }
+ };
public static final H2dVariableType RELAXATION = new H2dVariableType(H2dResource.getS("Relaxation"), null, "relax") {
@Override
@@ -300,12 +319,12 @@
}
public final static H2dVariableTypeCreated createTempVar(final String _name, final String _shortName,
- final Map _strName) {
+ final Map _strName) {
return new H2dVariableTypeCreated(_name, _shortName, _strName);
}
public final static H2dVariableTypeCreated createTempVar(final String _name, final String _shortName,
- final String _unit, final Map _strName) {
+ final String _unit, final Map _strName) {
return new H2dVariableTypeCreated(_name, _shortName, _unit, _strName);
}
@@ -388,7 +407,7 @@
}
};
public static final H2dVariableType VITESSE_NORMALE = new H2dVariableTypeVitesse(H2dResource.getS("Vitesse normale"),
- "U", "un") {
+ "U", "un") {
@Override
public boolean canBeTransient() {
@@ -400,20 +419,20 @@
return _c.getU();
}
- };
+ };
public static final H2dVariableType VITESSE_TANGENTIELLE = new H2dVariableTypeVitesse(H2dResource
- .getS("Vitesse tangentielle"), "V", "ut") {
+ .getS("Vitesse tangentielle"), "V", "ut") {
@Override
public boolean canBeTransient() {
return true;
}
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return _c.getV();
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return _c.getV();
+ }
+ };
public static final H2dVariableType VENT = new H2dVariableType(H2dResource.getS("Vent"), null, "wind") {
@Override
@@ -464,7 +483,7 @@
*/
public final static boolean isTracerVariable(final H2dVariableType _t) {
return (_t == H2dVariableTransType.TRACEUR) || (_t == H2dVariableTransType.TRACEUR_COEF_A)
- || (_t == H2dVariableTransType.TRACEUR_COEF_B);
+ || (_t == H2dVariableTransType.TRACEUR_COEF_B);
}
private String telemacID_;
@@ -512,7 +531,9 @@
*/
public static H2dVariableType getVarFromShortName(final String _shortName, final Map _shortNameVarCreated) {
final H2dVariableType t = (H2dVariableType) shortNameVar.get(_shortName);
- if (t == null && _shortNameVarCreated != null) { return (H2dVariableType) _shortNameVarCreated.get(_shortName); }
+ if (t == null && _shortNameVarCreated != null) {
+ return (H2dVariableType) _shortNameVarCreated.get(_shortName);
+ }
return t;
}
@@ -546,7 +567,7 @@
/**
* Par exemple renvoie vitesse pour vitesse_u et vitesse_v.
- *
+ *
* @return la variable parent. null par defaut
*/
public H2dVariableType getParentVariable() {
@@ -580,7 +601,7 @@
/**
* Pour l'affichage.
- *
+ *
* @return si valeur entiere
*/
public boolean isInteger() {
@@ -589,10 +610,10 @@
/**
* Optimisation.
- *
+ *
* @return true si vitesse
*/
public boolean isVitesse() {
return false;
}
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|