Menu
▾
▴
|
From: <de...@us...> - 2008-11-25 21:18:44
|
Revision: 4239
http://fudaa.svn.sourceforge.net/fudaa/?rev=4239&view=rev
Author: deniger
Date: 2008-11-25 21:18:30 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
Property Changed:
----------------
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java 2008-11-25 15:54:12 UTC (rev 4238)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java 2008-11-25 21:18:30 UTC (rev 4239)
@@ -7,6 +7,8 @@
*/
package org.fudaa.dodico.reflux.io;
+import gnu.trove.TIntObjectHashMap;
+
import java.util.Map;
import org.fudaa.ctulu.fileformat.FileFormat;
@@ -18,6 +20,7 @@
import org.fudaa.dodico.h2d.H2dTimeStepGroup;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition;
+import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryConditionMutable;
import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters;
import org.fudaa.dodico.h2d.type.H2dProjetType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
@@ -25,7 +28,8 @@
public class RefluxInpAdapter extends EfGridSourcesAbstract implements INPInterface {
final H2dRefluxBordIndexGeneral[] bd_;
- final H2dRefluxBoundaryCondition[] cls_;
+ // final H2dRefluxBoundaryCondition[] cls_;
+ final TIntObjectHashMap cls_;
String[] fics_;
final boolean isSoll_;
final H2dRefluxParameters params_;
@@ -44,13 +48,25 @@
fics_ = _fic;
params_ = _params;
bd_ = params_.getRefluxClManager().getRefluxBord();
- cls_ = params_.getRefluxClManager().getRefluxCl();
+ cls_ = saveCL(params_.getRefluxClManager().getRefluxCl());
+
// sollicitations r\xE9parties
isSoll_ = H2dRefluxBordIndexGeneral.isSollicitation(bd_);
times_ = params_.getGroupePasTempsTab();
// nbDigits_ = _nbDigitForSoll;
}
+ private TIntObjectHashMap saveCL(final H2dRefluxBoundaryCondition[] _cl) {
+ final TIntObjectHashMap clMap = new TIntObjectHashMap(_cl.length);
+ for (int i = _cl.length - 1; i >= 0; i--) {
+ final H2dRefluxBoundaryCondition s = _cl[i];
+ if (s != null) {
+ clMap.put(s.getIndexPt(), s);
+ }
+ }
+ return clMap;
+ }
+
/**
* @return true si contient Radiations
*/
@@ -80,7 +96,7 @@
}
public H2dRefluxBoundaryCondition getConditionLimite(final int _r) {
- return cls_[_r];
+ return (H2dRefluxBoundaryCondition)cls_.get(_r);
}
public Map getEntiteValue() {
Property changes on: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java:3704-4238
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2008-11-25 21:25:29
|
Revision: 4240
http://fudaa.svn.sourceforge.net/fudaa/?rev=4240&view=rev
Author: deniger
Date: 2008-11-25 21:25:20 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
Property Changed:
----------------
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
Property changes on: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java:3704-4238
+ /trunk/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java:3704-4239
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2008-11-25 21:29:19
|
Revision: 4241
http://fudaa.svn.sourceforge.net/fudaa/?rev=4241&view=rev
Author: deniger
Date: 2008-11-25 21:29:18 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
Property Changed:
----------------
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java 2008-11-25 21:25:20 UTC (rev 4240)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java 2008-11-25 21:29:18 UTC (rev 4241)
@@ -12,7 +12,6 @@
import java.util.Map;
import org.fudaa.ctulu.fileformat.FileFormat;
-
import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.ef.impl.EfGridSourcesAbstract;
import org.fudaa.dodico.fortran.FortranDoubleReaderResultInterface;
@@ -20,7 +19,6 @@
import org.fudaa.dodico.h2d.H2dTimeStepGroup;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition;
-import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryConditionMutable;
import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters;
import org.fudaa.dodico.h2d.type.H2dProjetType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
Property changes on: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java:3704-4239
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
