fudaa-cvs-commit Mailing List for Fudaa (Page 38)

https://gitlab.com/fudaa

Brought to you by: bmarchan, deniger, gpoissonnier, hadouxad

fudaa-cvs-commit — Mailing list for CVS commit messages

You can subscribe to this list here.

2003	_Jan	_Feb (89)	_Mar (219)	_Apr (82)	_May (33)	_Jun (11)	_Jul (129)	_Aug (357)	_Sep (34)	_Oct (37)	_Nov (42)	_Dec (182)
2004	_Jan (59)	_Feb (74)	_Mar (196)	_Apr (205)	_May (109)	_Jun (268)	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 36 37 38 39 40 .. 86 > >> (Page 38 of 86)

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource livre-ouvert-modif_16.png,1.1,1.2 livre-ouvert-modif_20.png,1.1,1.2

From: <de...@us...> - 2003-12-19 12:10:58

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource
In directory sc8-pr-cvs1:/tmp/cvs-serv28766/ressource

Modified Files:
	livre-ouvert-modif_16.png livre-ouvert-modif_20.png 
Log Message:
General update for prepro


Index: livre-ouvert-modif_16.png
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource/livre-ouvert-modif_16.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsxbCuzT and /tmp/cvs2Gl3WC differ

Index: livre-ouvert-modif_20.png
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource/livre-ouvert-modif_20.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsvZ0NnU and /tmp/cvsu5xKzE differ

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo FudaaUndoPaneFille.java,1.3,1.4

From: <de...@us...> - 2003-12-19 12:10:58

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo
In directory sc8-pr-cvs1:/tmp/cvs-serv28766/commun/undo

Modified Files:
	FudaaUndoPaneFille.java 
Log Message:
General update for prepro


Index: FudaaUndoPaneFille.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo/FudaaUndoPaneFille.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FudaaUndoPaneFille.java	11 Dec 2003 12:50:53 -0000	1.3
--- FudaaUndoPaneFille.java	19 Dec 2003 12:10:55 -0000	1.4
***************
*** 65,72 ****
        listener.add(_mng);
    }
!   protected Component getSelectedComponent() {
      return pane_==null?null:pane_.getSelectedComponent();
    }
!   protected DodicoCommandManager getActiveCmdMng() {
      FudaaUndoCmdMngContainer cpt=
        (FudaaUndoCmdMngContainer)pane_.getSelectedComponent();
--- 65,72 ----
        listener.add(_mng);
    }
!   public Component getSelectedComponent() {
      return pane_==null?null:pane_.getSelectedComponent();
    }
!   public DodicoCommandManager getActiveCmdMng() {
      FudaaUndoCmdMngContainer cpt=
        (FudaaUndoCmdMngContainer)pane_.getSelectedComponent();

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/commun FudaaImportCsvPanel.java,NONE,1.1

From: <de...@us...> - 2003-12-19 12:10:57

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv28766/commun

Added Files:
	FudaaImportCsvPanel.java 
Log Message:
General update for prepro


--- NEW FILE: FudaaImportCsvPanel.java ---
(This appears to be a binary file; contents omitted.)

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io SerafinFileFormat.java,1.11,1.12 Telemac2dFileFormat.java,1.7,1.8 TelemacDicoFileFormatVersion.java,1.8,1.9 TelemacLiquideFileFormat.java,1.8,1.9

From: <de...@us...> - 2003-12-19 12:10:41

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io
In directory sc8-pr-cvs1:/tmp/cvs-serv28839/telemac/io

Modified Files:
	SerafinFileFormat.java Telemac2dFileFormat.java 
	TelemacDicoFileFormatVersion.java 
	TelemacLiquideFileFormat.java 
Log Message:
Update for h2d model
Add support for evolution


Index: SerafinFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SerafinFileFormat.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SerafinFileFormat.java	11 Dec 2003 12:41:28 -0000	1.11
--- SerafinFileFormat.java	19 Dec 2003 12:10:37 -0000	1.12
***************
*** 134,138 ****
       *
       */
!     public FileOperationSynthese writeMaillage(
        File _f,
        H2dGrid _m,
--- 134,138 ----
       *
       */
!     public FileOperationSynthese writeGrid(
        File _f,
        H2dGrid _m,

Index: Telemac2dFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/Telemac2dFileFormat.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Telemac2dFileFormat.java	25 Nov 2003 10:11:58 -0000	1.7
--- Telemac2dFileFormat.java	19 Dec 2003 12:10:37 -0000	1.8
***************
*** 41,50 ****
        super(getInstance(), _dico);
      }
-     public DicoEntite getCLLiquideEntiteFile() {
-       return getEntiteFor(
-         new String[] {
-           "FICHIER DES FRONTIERES LIQUIDES",
-           "LIQUID BOUNDARIES FILE" });
-     }
      public TelemacLiquideFileFormat
        .TelemacLiquideVersion getDefaultTelemacLiquideFormat() {
--- 41,44 ----
***************
*** 58,62 ****
        if (r == null) {
          if (ent.equals(getCLLiquideEntiteFile()))
!           return H2dFileFormatType.CL_LIQUIDE;
        }
        return r;
--- 52,56 ----
        if (r == null) {
          if (ent.equals(getCLLiquideEntiteFile()))
!           return H2dFileFormatType.COURBE_TRANSITOIRE;
        }
        return r;

Index: TelemacDicoFileFormatVersion.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacDicoFileFormatVersion.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TelemacDicoFileFormatVersion.java	12 Dec 2003 10:30:55 -0000	1.8
--- TelemacDicoFileFormatVersion.java	19 Dec 2003 12:10:37 -0000	1.9
***************
*** 193,195 ****
--- 193,225 ----
      return CtuluLib.TROIS.equals(_v);
    }
+   /**
+    *
+    */
+   public DicoEntite getDureeDuCalcul() {
+     return getEntiteFor(
+       new String[] {
+         "DUREE DU CALCUL",
+         "DURATION" });
+   }
+ 
+   /**
+    *
+    */
+   public DicoEntite getNbPasTemps() {
+     return getEntiteFor(
+   new String[] {
+     "NOMBRE DE PAS DE TEMPS",
+     "NUMBER OF TIME STEPS" });
+   }
+ 
+   /**
+    *
+    */
+   public DicoEntite getPasTemps() {
+     return getEntiteFor(
+   new String[] {
+     "PAS DE TEMPS",
+     "TIME STEP" });
+   }
+ 
  }

Index: TelemacLiquideFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacLiquideFileFormat.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TelemacLiquideFileFormat.java	11 Dec 2003 12:41:29 -0000	1.8
--- TelemacLiquideFileFormat.java	19 Dec 2003 12:10:37 -0000	1.9
***************
*** 9,12 ****
--- 9,13 ----
  package org.fudaa.dodico.telemac.io;
  import java.io.File;
+ 
  import org.fudaa.dodico.commun.ProgressionInterface;
  import org.fudaa.dodico.fichiers.FileFormat;
***************
*** 16,19 ****
--- 17,23 ----
  import org.fudaa.dodico.fichiers.FileReadOperationAbstract;
  import org.fudaa.dodico.fichiers.FileWriteOperationAbstract;
+ import org.fudaa.dodico.h2d.H2dEvolution;
+ import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquide;
+ import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion;
  import org.fudaa.dodico.h2d.H2dResource;
  import org.fudaa.dodico.h2d.type.H2dFileFormatType;
***************
*** 29,37 ****
      return INSTANCE;
    }
    protected TelemacLiquideFileFormat() {
      super(NB_FILE);
      extensions_= new String[] { "liq" };
      ID_= "TELEMAC_FL";
!     nom_= H2dResource.getS("Frontières Liquides transitoire");
      description_=
        H2dResource.getS(
--- 33,42 ----
      return INSTANCE;
    }
+   private static TelemacLiquideVersion lastVersion_;
    protected TelemacLiquideFileFormat() {
      super(NB_FILE);
      extensions_= new String[] { "liq" };
      ID_= "TELEMAC_FL";
!     nom_= H2dResource.getS("Frontières Liquides (Télémac)");
      description_=
        H2dResource.getS(
***************
*** 39,49 ****
      mode_= MODE_ASCII;
      software_= FileFormatSoftware.TELEMAC_IS;
!     type_= H2dFileFormatType.CL_LIQUIDE.getId();
    }
!   
!   public FileFormatVersion getLastVersionInstance(){
      return getLastVersionImpl();
    }
!   public class TelemacLiquideVersion extends FileFormatVersion {
      TelemacLiquideVersion(String _b) {
        super(getInstance(), _b);
--- 44,56 ----
      mode_= MODE_ASCII;
      software_= FileFormatSoftware.TELEMAC_IS;
!     type_= H2dFileFormatType.COURBE_TRANSITOIRE.getId();
    }
! 
!   public FileFormatVersion getLastVersionInstance() {
      return getLastVersionImpl();
    }
!   public class TelemacLiquideVersion
!     extends FileFormatVersion
!     implements H2dFileFormatEvolutionVersion {
      TelemacLiquideVersion(String _b) {
        super(getInstance(), _b);
***************
*** 82,85 ****
--- 89,111 ----
        return w.write(_source);
      }
+     /**
+      *
+      */
+     public FileOperationSynthese readEvolutions(
+       File _f,
+       ProgressionInterface _prog) {
+       FileOperationSynthese op= read(_f, _prog);
+       TelemacLiquideInterface source= (TelemacLiquideInterface)op.getSource();
+       H2dEvolutionFrontiereLiquide[] evolLiq=
+         source.getEvolutionsFrontieresLiquides();
+       int n= evolLiq.length;
+       H2dEvolution[] evol= new H2dEvolution[n];
+       for (int i= 0; i < n; i++) {
+       evol[i]=evolLiq[i].getEvol();
+       }
+       op.setSource(evol);
+       return op;
+     }
+ 
    }
    /**
***************
*** 90,94 ****
    }
    public TelemacLiquideVersion getLastVersionImpl() {
!     return new TelemacLiquideVersion(getLastVersion());
    }
  }
--- 116,122 ----
    }
    public TelemacLiquideVersion getLastVersionImpl() {
!     if (lastVersion_ == null)
!       lastVersion_= new TelemacLiquideVersion(getLastVersion());
!     return lastVersion_;
    }
  }

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/test TestEvolution.java,NONE,1.1 courbes.txt,NONE,1.1 courbesFortran.txt,NONE,1.1 TestIO.java,1.6,1.7

From: <de...@us...> - 2003-12-19 12:10:41

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test
In directory sc8-pr-cvs1:/tmp/cvs-serv28839/test

Modified Files:
	TestIO.java 
Added Files:
	TestEvolution.java courbes.txt courbesFortran.txt 
Log Message:
Update for h2d model
Add support for evolution


--- NEW FILE: TestEvolution.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: courbes.txt ---
#essai
t;c1;c2;c3
1;3;4;5
a b
2;4;5;6
3;5;6;7
4;10;11;12


--- NEW FILE: courbesFortran.txt ---
100230
a b
200430
300630
400830
5001030


Index: TestIO.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestIO.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestIO.java	25 Nov 2003 10:11:59 -0000	1.6
--- TestIO.java	19 Dec 2003 12:10:37 -0000	1.7
***************
*** 35,38 ****
--- 35,39 ----
        e.printStackTrace();
      }
+     f.deleteOnExit();
      return f;
    }

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux TestCrb.java,NONE,1.1 canal_t.crb,NONE,1.1

From: <de...@us...> - 2003-12-19 12:10:41

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv28839/test/reflux

Added Files:
	TestCrb.java canal_t.crb 
Log Message:
Update for h2d model
Add support for evolution


--- NEW FILE: TestCrb.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: canal_t.crb ---
*!$ Version 5.11
Lido - Profil1          16
    3600.0     16.325
    7200.0     16.325
   10800.0     16.434
   14400.0     16.539
   18000.0     16.591
   21600.0      16.64
   25200.0     16.689
   28800.0     16.737
   32400.0      16.69
   36000.0     16.641
   39600.0     16.591
   43200.0      16.54
   46800.0     16.436
   50400.0     16.325
   54000.0     16.325
   57600.0     16.325
Lido - Profil3          16
    3600.0     13.353
    7200.0     13.353
   10800.0       13.6
   14400.0     13.865
   18000.0     14.007
   21600.0      14.14
   25200.0     14.273
   28800.0     14.405
   32400.0     14.293
   36000.0      14.16
   39600.0     14.027
   43200.0     13.894
   46800.0     13.637
   50400.0     13.371
   54000.0     13.353
   57600.0     13.353

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io CrbFileFormat.java,NONE,1.1 CrbReader.java,NONE,1.1 CrbWriter.java,NONE,1.1 CLTransitoireFileFormat.java,1.5,1.6 CorEleBthFileFormat.java,1.10,1.11 INPAdapter.java,1.10,1.11 INPFileFormat.java,1.13,1.14 INPWriter.java,1.11,1.12