fudaa-svn-commit

[Fudaa-svn-commit] SF.net SVN: fudaa:[5736] trunk/business/dodico-corba

[<fa...@us...>]

Revision: 5736
          http://fudaa.svn.sourceforge.net/fudaa/?rev=5736&view=rev
Author:   fargeix
Date:     2010-03-31 11:11:24 +0000 (Wed, 31 Mar 2010)

Log Message:
-----------
Bug REFONDE-1 : D?\195?\169finition d'un dossier temporaire d'ex?\195?\169cution des calculs

Modified Paths:
--------------
    trunk/business/dodico-corba/pom.xml
    trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/calcul/DCalcul.java

Modified: trunk/business/dodico-corba/pom.xml
===================================================================
--- trunk/business/dodico-corba/pom.xml	2010-03-30 21:27:25 UTC (rev 5735)
+++ trunk/business/dodico-corba/pom.xml	2010-03-31 11:11:24 UTC (rev 5736)
@@ -12,7 +12,7 @@
 	</parent>
 	<groupId>org.fudaa.business</groupId>
 	<artifactId>dodico-corba</artifactId>
-	<version>1.0</version>
+	<version>1.02</version>
 	<name>dodico-corba</name>
 	<!-- on importe les dépendences du framework -->
 	<dependencyManagement>

Modified: trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/calcul/DCalcul.java
===================================================================
--- trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/calcul/DCalcul.java	2010-03-30 21:27:25 UTC (rev 5735)
+++ trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/calcul/DCalcul.java	2010-03-31 11:11:24 UTC (rev 5736)
@@ -246,6 +246,26 @@
     }
     return path;
   }
+  
+  /**
+   * Construire le chemin d'acces au dossier temporaire des serveurs. En premier, la variable d'environnement <code>"FUDAA_TMPDIR"</code>
+   * est utilisee. Si elle n'existe pas, le chemin relatif <code>"dossier_tmp_de_l_os/"+getNomApp()</code> est utilise.
+   *
+   * @return le chemin d'acces au dossier temporaire du serveur (codes de calcul)
+   * @see #getNomApp()
+   */
+  protected final String cheminTmp() {
+    String path = System.getProperty("FUDAA_TMPDIR");
+    if ((path == null) || path.equals("")) {
+      path = System.getProperty("java.io.tmpdir") + File.separator + "fudaa_srv"
+          + File.separator + getNomFichierApp();
+      new File(path).mkdirs();
+    }
+    if (!path.endsWith(File.separator)) {
+      path += File.separator;
+    }
+    return path;
+  }
 
   /**
    * Efface tous les fichiers utilises par la connexion <code>_c</code>.
@@ -259,7 +279,7 @@
 
   /**
    * Renvoie tous les fichiers utilises par la connexion <code>_c</code>. La localisation des fichiers est specifiee
-   * par la fonction <code>cheminServeur()</code>.<br>
+   * par la fonction <code>cheminServeur()</code> ou la fonction <code>cheminTmp()</code>.<br>
    * Les noms des fichiers sont construits a partir de la concatenation du nom de l'application <code>getNomApp()</code>
    * et du numero de la connexion <code>_c</code>. Le numero est eventuellement complete pour satisfaire au format
    * (nombre minimum de chiffres) precise lors de l'affectation
@@ -275,15 +295,20 @@
       return new File[0];
     }
     final String path = cheminServeur();
+    final String tmpdir = cheminTmp();
+    final boolean tmpdirExists = new File(tmpdir).exists();
     String noEtude = "" + _c.numero();
     final int t = noEtude.length();
     for (int i = t; i < formatExt_; i++) {
       noEtude = "0" + noEtude;
     }
     final String nomEtude = getNomFichierApp() + noEtude;
-    final File[] fics = new File[extensions_.length];
+    
+    final int nbFics = tmpdirExists ? 2*extensions_.length : extensions_.length;
+    final File[] fics = new File[nbFics];
     for (int i = 0; i < extensions_.length; i++) {
       fics[i] = new File(path + nomEtude + extensions_[i]);
+      if (tmpdirExists) fics[i + extensions_.length] = new File(tmpdir + nomEtude + extensions_[i]);
     }
     return fics;
   }


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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8698] trunk/business/dodico-corba

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

Revision: 8698
          http://sourceforge.net/p/fudaa/svn/8698
Author:   deniger
Date:     2014-05-17 11:49:15 +0000 (Sat, 17 May 2014)
Log Message:
-----------
ajout nouveau variable pour Mascaret

Modified Paths:
--------------
    trunk/business/dodico-corba/pom.xml
    trunk/business/dodico-corba/src/main/idl/code/mascaret.idl
    trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java

Modified: trunk/business/dodico-corba/pom.xml
===================================================================
--- trunk/business/dodico-corba/pom.xml	2014-04-29 11:48:14 UTC (rev 8697)
+++ trunk/business/dodico-corba/pom.xml	2014-05-17 11:49:15 UTC (rev 8698)
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>org.fudaa.pom</groupId>
 		<artifactId>business-pom</artifactId>
-		<version>1.3</version>
+		<version>1.4</version>
 	</parent>
 	<groupId>org.fudaa.business</groupId>
 	<artifactId>dodico-corba</artifactId>
-	<version>1.1-SNAPSHOT</version>
+	<version>1.2-SNAPSHOT</version>
 	<name>dodico-corba</name>
 	<!-- on importe les dépendences du framework -->
 	<dependencyManagement>

Modified: trunk/business/dodico-corba/src/main/idl/code/mascaret.idl
===================================================================
--- trunk/business/dodico-corba/src/main/idl/code/mascaret.idl	2014-04-29 11:48:14 UTC (rev 8697)
+++ trunk/business/dodico-corba/src/main/idl/code/mascaret.idl	2014-05-17 11:49:15 UTC (rev 8698)
@@ -85,6 +85,8 @@
       booleen perteChargeAutoElargissement; // pertes de charge automatique noyau transcritique
       booleen termesNonHydrostatiques; // termes non hydrostatiques pour le noyau transcritique
       SParametresNumCasier parametresNumeriqueCasier; // param\xE8tres num\xE9riques utilis\xE9 par casier
+      booleen apportDebit;
+      booleen frottementsParois;
     };
     //-----------FIN RUBRIQUE PARAMETRES NUMERIQUES-------------------------
 

Modified: trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java
===================================================================
--- trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java	2014-04-29 11:48:14 UTC (rev 8697)
+++ trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java	2014-05-17 11:49:15 UTC (rev 8698)
@@ -18,6 +18,8 @@
   public boolean optimisNoyauTrans = false;
   public boolean perteChargeAutoElargissement = false;
   public boolean termesNonHydrostatiques = false;
+  public boolean apportDebit = false;
+  public boolean attenuationConvection = false;
 
   // termes non hydrostatiques pour le noyau transcritique
   public org.fudaa.dodico.corba.mascaret.SParametresNumCasier parametresNumeriqueCasier = null;

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8890] trunk/business/dodico-corba

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

Revision: 8890
          http://sourceforge.net/p/fudaa/svn/8890
Author:   deniger
Date:     2014-10-22 21:58:46 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
maj couleur par defaut ?\195?\160 similaire

Modified Paths:
--------------
    trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresSeuil.java

Added Paths:
-----------
    trunk/business/dodico-corba/nbactions.xml

Added: trunk/business/dodico-corba/nbactions.xml
===================================================================
--- trunk/business/dodico-corba/nbactions.xml	                        (rev 0)
+++ trunk/business/dodico-corba/nbactions.xml	2014-10-22 21:58:46 UTC (rev 8890)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>CUSTOM-deploy</actionName>
+            <displayName>deploy</displayName>
+            <goals>
+                <goal>deploy</goal>
+            </goals>
+        </action>
+    </actions>

Modified: trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresSeuil.java
===================================================================
--- trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresSeuil.java	2014-10-22 16:29:18 UTC (rev 8889)
+++ trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresSeuil.java	2014-10-22 21:58:46 UTC (rev 8890)
@@ -1,37 +1,35 @@
 package org.fudaa.dodico.corba.mascaret;
 
+import org.fudaa.dodico.boony.BoonyDeserializationAware;
 
 /**
-* org/fudaa/dodico/corba/mascaret/SParametresSeuil.java .
-* Error reading Messages File.
-* Error reading Messages File.
-* mercredi 24 octobre 2012 16 h 50 CEST
-*/
-
-public final class SParametresSeuil implements org.omg.CORBA.portable.IDLEntity
-{
+ * org/fudaa/dodico/corba/mascaret/SParametresSeuil.java . Error reading Messages File. Error reading Messages File. mercredi 24 octobre 2012 16 h 50
+ * CEST
+ */
+public final class SParametresSeuil implements org.omg.CORBA.portable.IDLEntity, BoonyDeserializationAware {
+  public static final int PARAMETRES_SEUIL_DEFAULT_VALUE = 1;
   public String nom = null;
-  public int type = (int)0;
-  public int numBranche = (int)0;
-  public double abscisse = (double)0;
-  public double coteCrete = (double)0;
-  public double coteCreteMoy = (double)0;
-  public double coteRupture = (double)0;
-  public double coeffDebit = (double)0;
-  public double largVanne = (double)0;
-  public int numLoi = (int)0;
-  public int nbPtLoiSeuil = (int)0;
+  public int type = (int) 0;
+  public int numBranche = (int) 0;
+  public double abscisse = (double) 0;
+  public double coteCrete = (double) 0;
+  public double coteCreteMoy = (double) 0;
+  public double coteRupture = (double) 0;
+  public double coeffDebit = (double) 0;
+  public double largVanne = (double) 0;
+  public int numLoi = (int) 0;
+  public int nbPtLoiSeuil = (int) 0;
   public double abscTravCrete[] = null;
   public double cotesCrete[] = null;
-  public int epaisseur = (int)0;
-  public double gradient = (double)0;
+  public int epaisseur = (int) 0;
+  public double gradient = (double) 0;
 
-  public SParametresSeuil ()
-  {
+  public SParametresSeuil() {
   } // ctor
 
-  public SParametresSeuil (String _nom, int _type, int _numBranche, double _abscisse, double _coteCrete, double _coteCreteMoy, double _coteRupture, double _coeffDebit, double _largVanne, int _numLoi, int _nbPtLoiSeuil, double[] _abscTravCrete, double[] _cotesCrete, int _epaisseur, double _gradient)
-  {
+  public SParametresSeuil(String _nom, int _type, int _numBranche, double _abscisse, double _coteCrete, double _coteCreteMoy, double _coteRupture,
+          double _coeffDebit, double _largVanne, int _numLoi, int _nbPtLoiSeuil, double[] _abscTravCrete, double[] _cotesCrete, int _epaisseur,
+          double _gradient) {
     nom = _nom;
     type = _type;
     numBranche = _numBranche;
@@ -49,4 +47,11 @@
     gradient = _gradient;
   } // ctor
 
+  @Override
+  public void endDeserialization() {
+    if (epaisseur == Integer.MIN_VALUE || epaisseur == Integer.MAX_VALUE) {
+      epaisseur = PARAMETRES_SEUIL_DEFAULT_VALUE;
+    }
+  }
+
 } // class SParametresSeuil

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