Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5486] trunk/business/fudaa-ef
|
From: <chr...@us...> - 2009-11-18 18:02:20
|
Revision: 5486
http://fudaa.svn.sourceforge.net/fudaa/?rev=5486&view=rev
Author: chrisc83
Date: 2009-11-18 18:02:05 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
OPEN - issue PREPRO-53: Ajout d'un panel pour le traitement du maillage
http://www.fudaa.fr/jira/browse/PREPRO-53
Modified Paths:
--------------
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleActivity.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircReader.java
trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/adcirc/TestAdcircReader.java
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.java 2009-11-17 17:11:44 UTC (rev 5485)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.java 2009-11-18 18:02:05 UTC (rev 5486)
@@ -10,9 +10,8 @@
import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.ef.EfSegment;
import org.fudaa.dodico.ef.operation.AbstractEfOperation;
-import org.fudaa.dodico.ef.operation.EfOperation;
import org.fudaa.dodico.ef.operation.EfOperationResult;
-import org.fudaa.dodico.ef.operation.refine.*;
+import org.fudaa.dodico.ef.operation.refine.EfOperationRefine;
import org.fudaa.dodico.ef.operation.type.EfOperationToT3;
import org.fudaa.dodico.ef.operation.type.EfOperationToT6;
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleActivity.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleActivity.java 2009-11-17 17:11:44 UTC (rev 5485)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleActivity.java 2009-11-18 18:02:05 UTC (rev 5486)
@@ -17,7 +17,6 @@
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
-
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.ef.EfElement;
import org.fudaa.dodico.ef.EfElementType;
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.java 2009-11-17 17:11:44 UTC (rev 5485)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.java 2009-11-18 18:02:05 UTC (rev 5486)
@@ -2,9 +2,6 @@
import gnu.trove.TIntIntHashMap;
-import java.util.ArrayList;
-import java.util.Collections;
-
import org.fudaa.ctulu.CtuluAnalyzeNew;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
@@ -53,10 +50,10 @@
protected EfGridData process(ProgressionInterface prog, CtuluAnalyzeNew log) {
//TODO Voir si il ne faut pas que \xE7a plante si le nb de node = 0.
EfGridInterface grid = this.initGrid.getGrid();
+ grid.computeBord(prog, null);
int nbPts = grid.getPtsNb();
int nbElements = grid.getEltNb();
- int[] newIdxOldIdx = this
- .getNewIdxOldIdx(this.getPtsWeight(prog), prog);
+ int[] newIdxOldIdx = this.getNewIdxOldIdx(this.getPtsWeight(prog), prog);
int[] oldIdxNewIdx = this.getOldIdxNewIdx(newIdxOldIdx, prog);
EfElement[] elements = grid.getElts();
EfElement[] newElements = new EfElement[nbElements];
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircReader.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircReader.java 2009-11-17 17:11:44 UTC (rev 5485)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircReader.java 2009-11-18 18:02:05 UTC (rev 5486)
@@ -65,7 +65,7 @@
for (int j = 0; j < pts.length; j++)
{
- pts[j] = in_.intField(j + 2);
+ pts[j] = (in_.intField(j + 2) - 1);
}
elements[i] = new EfElement(pts);
Modified: trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/adcirc/TestAdcircReader.java
===================================================================
--- trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/adcirc/TestAdcircReader.java 2009-11-17 17:11:44 UTC (rev 5485)
+++ trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/adcirc/TestAdcircReader.java 2009-11-18 18:02:05 UTC (rev 5486)
@@ -139,102 +139,102 @@
{
EfElement[] elements = new EfElement[96];
- elements[0] = new EfElement(new int[]{1, 2, 3});
- elements[1] = new EfElement(new int[]{2, 4, 3});
- elements[2] = new EfElement(new int[]{4, 2, 6});
- elements[3] = new EfElement(new int[]{6, 2, 5});
- elements[4] = new EfElement(new int[]{7, 6, 5});
- elements[5] = new EfElement(new int[]{8, 6, 7});
- elements[6] = new EfElement(new int[]{8, 7, 10});
- elements[7] = new EfElement(new int[]{10, 7, 9});
- elements[8] = new EfElement(new int[]{11, 10, 9});
- elements[9] = new EfElement(new int[]{12, 10, 11});
- elements[10] = new EfElement(new int[]{3, 13, 14});
- elements[11] = new EfElement(new int[]{4, 13, 3});
- elements[12] = new EfElement(new int[]{12, 11, 16});
- elements[13] = new EfElement(new int[]{16, 11, 15});
- elements[14] = new EfElement(new int[]{4, 6, 13});
- elements[15] = new EfElement(new int[]{6, 17, 13});
- elements[16] = new EfElement(new int[]{6, 18, 17});
- elements[17] = new EfElement(new int[]{8, 18, 6});
- elements[18] = new EfElement(new int[]{13, 20, 14});
- elements[19] = new EfElement(new int[]{19, 20, 13});
- elements[20] = new EfElement(new int[]{8, 10, 18});
- elements[21] = new EfElement(new int[]{10, 21, 18});
- elements[22] = new EfElement(new int[]{19, 13, 22});
- elements[23] = new EfElement(new int[]{22, 13, 17});
- elements[24] = new EfElement(new int[]{12, 23, 10});
- elements[25] = new EfElement(new int[]{10, 23, 21});
- elements[26] = new EfElement(new int[]{19, 25, 20});
- elements[27] = new EfElement(new int[]{20, 25, 24});
- elements[28] = new EfElement(new int[]{12, 16, 23});
- elements[29] = new EfElement(new int[]{16, 26, 23});
- elements[30] = new EfElement(new int[]{18, 22, 17});
- elements[31] = new EfElement(new int[]{27, 22, 18});
- elements[32] = new EfElement(new int[]{29, 28, 25});
- elements[33] = new EfElement(new int[]{25, 28, 24});
- elements[34] = new EfElement(new int[]{19, 22, 25});
- elements[35] = new EfElement(new int[]{25, 22, 30});
- elements[36] = new EfElement(new int[]{27, 18, 31});
- elements[37] = new EfElement(new int[]{31, 18, 21});
- elements[38] = new EfElement(new int[]{28, 33, 32});
- elements[39] = new EfElement(new int[]{29, 33, 28});
- elements[40] = new EfElement(new int[]{22, 34, 30});
- elements[41] = new EfElement(new int[]{27, 34, 22});
- elements[42] = new EfElement(new int[]{35, 33, 36});
- elements[43] = new EfElement(new int[]{32, 33, 35});
- elements[44] = new EfElement(new int[]{21, 23, 31});
- elements[45] = new EfElement(new int[]{31, 23, 37});
- elements[46] = new EfElement(new int[]{38, 25, 30});
- elements[47] = new EfElement(new int[]{29, 25, 38});
- elements[48] = new EfElement(new int[]{36, 40, 35});
- elements[49] = new EfElement(new int[]{35, 40, 39});
- elements[50] = new EfElement(new int[]{41, 23, 26});
- elements[51] = new EfElement(new int[]{37, 23, 41});
- elements[52] = new EfElement(new int[]{42, 33, 38});
- elements[53] = new EfElement(new int[]{38, 33, 29});
- elements[54] = new EfElement(new int[]{43, 34, 31});
- elements[55] = new EfElement(new int[]{31, 34, 27});
- elements[56] = new EfElement(new int[]{44, 38, 34});
- elements[57] = new EfElement(new int[]{34, 38, 30});
- elements[58] = new EfElement(new int[]{45, 33, 42});
- elements[59] = new EfElement(new int[]{36, 33, 45});
- elements[60] = new EfElement(new int[]{46, 40, 45});
- elements[61] = new EfElement(new int[]{45, 40, 36});
- elements[62] = new EfElement(new int[]{37, 47, 31});
- elements[63] = new EfElement(new int[]{31, 47, 43});
- elements[64] = new EfElement(new int[]{38, 48, 42});
- elements[65] = new EfElement(new int[]{44, 48, 38});
- elements[66] = new EfElement(new int[]{44, 34, 49});
- elements[67] = new EfElement(new int[]{49, 34, 43});
- elements[68] = new EfElement(new int[]{42, 48, 45});
- elements[69] = new EfElement(new int[]{45, 48, 50});
- elements[70] = new EfElement(new int[]{37, 41, 47});
- elements[71] = new EfElement(new int[]{47, 41, 51});
- elements[72] = new EfElement(new int[]{45, 52, 46});
- elements[73] = new EfElement(new int[]{50, 52, 45});
- elements[74] = new EfElement(new int[]{44, 49, 48});
- elements[75] = new EfElement(new int[]{48, 49, 53});
- elements[76] = new EfElement(new int[]{43, 47, 49});
- elements[77] = new EfElement(new int[]{49, 47, 54});
- elements[78] = new EfElement(new int[]{50, 48, 55});
- elements[79] = new EfElement(new int[]{55, 48, 53});
- elements[80] = new EfElement(new int[]{56, 52, 55});
- elements[81] = new EfElement(new int[]{55, 52, 50});
- elements[82] = new EfElement(new int[]{57, 47, 51});
- elements[83] = new EfElement(new int[]{54, 47, 57});
- elements[84] = new EfElement(new int[]{54, 58, 49});
- elements[85] = new EfElement(new int[]{49, 58, 53});
- elements[86] = new EfElement(new int[]{59, 55, 58});
- elements[87] = new EfElement(new int[]{58, 55, 53});
- elements[88] = new EfElement(new int[]{55, 60, 56});
- elements[89] = new EfElement(new int[]{59, 60, 55});
- elements[90] = new EfElement(new int[]{54, 57, 58});
- elements[91] = new EfElement(new int[]{58, 57, 61});
- elements[92] = new EfElement(new int[]{62, 58, 61});
- elements[93] = new EfElement(new int[]{59, 58, 62});
- elements[94] = new EfElement(new int[]{63, 60, 62});
- elements[95] = new EfElement(new int[]{62, 60, 59});
+ elements[0] = new EfElement(new int[]{0,1,2});
+ elements[1] = new EfElement(new int[]{1,3,2});
+ elements[2] = new EfElement(new int[]{3,1,5});
+ elements[3] = new EfElement(new int[]{5,1,4});
+ elements[4] = new EfElement(new int[]{6,5,4});
+ elements[5] = new EfElement(new int[]{7,5,6});
+ elements[6] = new EfElement(new int[]{7,6,9});
+ elements[7] = new EfElement(new int[]{9,6,8});
+ elements[8] = new EfElement(new int[]{10,9,8});
+ elements[9] = new EfElement(new int[]{11,9,10});
+ elements[10] = new EfElement(new int[]{2,12,13});
+ elements[11] = new EfElement(new int[]{3,12,2});
+ elements[12] = new EfElement(new int[]{11,10,15});
+ elements[13] = new EfElement(new int[]{15,10,14});
+ elements[14] = new EfElement(new int[]{3,5,12});
+ elements[15] = new EfElement(new int[]{5,16,12});
+ elements[16] = new EfElement(new int[]{5,17,16});
+ elements[17] = new EfElement(new int[]{7,17,5});
+ elements[18] = new EfElement(new int[]{12,19,13});
+ elements[19] = new EfElement(new int[]{18,19,12});
+ elements[20] = new EfElement(new int[]{7,9,17});
+ elements[21] = new EfElement(new int[]{9,20,17});
+ elements[22] = new EfElement(new int[]{18,12,21});
+ elements[23] = new EfElement(new int[]{21,12,16});
+ elements[24] = new EfElement(new int[]{11,22,9});
+ elements[25] = new EfElement(new int[]{9,22,20});
+ elements[26] = new EfElement(new int[]{18,24,19});
+ elements[27] = new EfElement(new int[]{19,24,23});
+ elements[28] = new EfElement(new int[]{11,15,22});
+ elements[29] = new EfElement(new int[]{15,25,22});
+ elements[30] = new EfElement(new int[]{17,21,16});
+ elements[31] = new EfElement(new int[]{26,21,17});
+ elements[32] = new EfElement(new int[]{28,27,24});
+ elements[33] = new EfElement(new int[]{24,27,23});
+ elements[34] = new EfElement(new int[]{18,21,24});
+ elements[35] = new EfElement(new int[]{24,21,29});
+ elements[36] = new EfElement(new int[]{26,17,30});
+ elements[37] = new EfElement(new int[]{30,17,20});
+ elements[38] = new EfElement(new int[]{27,32,31});
+ elements[39] = new EfElement(new int[]{28,32,27});
+ elements[40] = new EfElement(new int[]{21,33,29});
+ elements[41] = new EfElement(new int[]{26,33,21});
+ elements[42] = new EfElement(new int[]{34,32,35});
+ elements[43] = new EfElement(new int[]{31,32,34});
+ elements[44] = new EfElement(new int[]{20,22,30});
+ elements[45] = new EfElement(new int[]{30,22,36});
+ elements[46] = new EfElement(new int[]{37,24,29});
+ elements[47] = new EfElement(new int[]{28,24,37});
+ elements[48] = new EfElement(new int[]{35,39,34});
+ elements[49] = new EfElement(new int[]{34,39,38});
+ elements[50] = new EfElement(new int[]{40,22,25});
+ elements[51] = new EfElement(new int[]{36,22,40});
+ elements[52] = new EfElement(new int[]{41,32,37});
+ elements[53] = new EfElement(new int[]{37,32,28});
+ elements[54] = new EfElement(new int[]{42,33,30});
+ elements[55] = new EfElement(new int[]{30,33,26});
+ elements[56] = new EfElement(new int[]{43,37,33});
+ elements[57] = new EfElement(new int[]{33,37,29});
+ elements[58] = new EfElement(new int[]{44,32,41});
+ elements[59] = new EfElement(new int[]{35,32,44});
+ elements[60] = new EfElement(new int[]{45,39,44});
+ elements[61] = new EfElement(new int[]{44,39,35});
+ elements[62] = new EfElement(new int[]{36,46,30});
+ elements[63] = new EfElement(new int[]{30,46,42});
+ elements[64] = new EfElement(new int[]{37,47,41});
+ elements[65] = new EfElement(new int[]{43,47,37});
+ elements[66] = new EfElement(new int[]{43,33,48});
+ elements[67] = new EfElement(new int[]{48,33,42});
+ elements[68] = new EfElement(new int[]{41,47,44});
+ elements[69] = new EfElement(new int[]{44,47,49});
+ elements[70] = new EfElement(new int[]{36,40,46});
+ elements[71] = new EfElement(new int[]{46,40,50});
+ elements[72] = new EfElement(new int[]{44,51,45});
+ elements[73] = new EfElement(new int[]{49,51,44});
+ elements[74] = new EfElement(new int[]{43,48,47});
+ elements[75] = new EfElement(new int[]{47,48,52});
+ elements[76] = new EfElement(new int[]{42,46,48});
+ elements[77] = new EfElement(new int[]{48,46,53});
+ elements[78] = new EfElement(new int[]{49,47,54});
+ elements[79] = new EfElement(new int[]{54,47,52});
+ elements[80] = new EfElement(new int[]{55,51,54});
+ elements[81] = new EfElement(new int[]{54,51,49});
+ elements[82] = new EfElement(new int[]{56,46,50});
+ elements[83] = new EfElement(new int[]{53,46,56});
+ elements[84] = new EfElement(new int[]{53,57,48});
+ elements[85] = new EfElement(new int[]{48,57,52});
+ elements[86] = new EfElement(new int[]{58,54,57});
+ elements[87] = new EfElement(new int[]{57,54,52});
+ elements[88] = new EfElement(new int[]{54,59,55});
+ elements[89] = new EfElement(new int[]{58,59,54});
+ elements[90] = new EfElement(new int[]{53,56,57});
+ elements[91] = new EfElement(new int[]{57,56,60});
+ elements[92] = new EfElement(new int[]{61,57,60});
+ elements[93] = new EfElement(new int[]{58,57,61});
+ elements[94] = new EfElement(new int[]{62,59,61});
+ elements[95] = new EfElement(new int[]{61,59,58});
return elements;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
