[Fudaa-svn-commit] SF.net SVN: fudaa:[8903] trunk/soft/fudaa-mascaret/server/src/main/java/org /fudaa/dodico

[<de...@us...>]

Revision: 8903
          http://sourceforge.net/p/fudaa/svn/8903
Author:   deniger
Date:     2014-10-28 21:07:17 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
maj shortcuts

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/CConversionHydraulique1d.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/MascaretClient.java

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/CConversionHydraulique1d.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/CConversionHydraulique1d.java	2014-10-28 20:59:44 UTC (rev 8902)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/CConversionHydraulique1d.java	2014-10-28 21:07:17 UTC (rev 8903)
@@ -96,7 +96,7 @@
                       .paramsReprise()));
     }
     parametresMascaret.parametresNCA(
-            new SParametresNCA("mascaret" + connexion_.numero() + ".cas"));
+            new SParametresNCA("mascaret" + connexion_.numero() + (xcas ? ".xcas" : ".cas")));
     MetierParametresTailleMaxFichier t
             = calculHydraulique1d.etude().paramResultats().paramTailleMaxFichier();
     parametresMascaret.parametresTailleMaxFichier(

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/MascaretClient.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/MascaretClient.java	2014-10-28 20:59:44 UTC (rev 8902)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/MascaretClient.java	2014-10-28 21:07:17 UTC (rev 8903)
@@ -80,8 +80,8 @@
       IResultatsMascaret rFic = IResultatsMascaretHelper.narrow(mascaret.resultats(c));
       // mascaret.parametres(pFic);
       String nomEtu = "mascaret" + c.numero();
-      cas.parametresGen.fichMotsCles = path + nomEtu + ".cas";
-      SParametresNCA ncas = new SParametresNCA(path + nomEtu + ".cas");
+      cas.parametresGen.fichMotsCles = path + nomEtu + ".xcas";
+      SParametresNCA ncas = new SParametresNCA(path + nomEtu + ".cxas");
       pFic.parametresNCA(ncas);
       cas.parametresGeoReseau.geometrie.fichier = path + nomEtu + ".geo";
       cas.parametresImpressResult.resultats.fichResultat = path + nomEtu + "_ecr.opt";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.