[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/ef EfSegment.java,NONE,1.1 EfSegmentMutab

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32356/src/org/fudaa/dodico/ef

Modified Files:
	EfGrid.java EfLib.java EfGridSourcesAbstract.java 
Added Files:
	EfSegment.java EfSegmentMutable.java EfGridVolume.java 
	EfElementVolume.java 
Removed Files:
	EfdSegment.java 
Log Message:


--- NEW FILE: EfElementVolume.java ---
/**
 *  @creation     8 juin 2004
 *  @modification $Date: 2004/06/11 16:32:15 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.dodico.ef;


/**
 * Classe décrivant un element d'un maillage voumique
 * @author Fred Deniger
 * @version $Id: EfElementVolume.java,v 1.1 2004/06/11 16:32:15 deniger Exp $
 */
public class EfElementVolume extends EfElement{
  
  private int[] areteIdx_;

  /**
   * Attention, les tableaux ne sont pas recopiés: il ne faut pas les modifier par la suite
   * @param _areteIdx les indices des aretes
   * @param _ndsIdx les indices des noeuds : issu des indices des noeuds
   */
  public EfElementVolume(int[] _areteIdx,int[] _ndsIdx) {
    super(_ndsIdx);
    areteIdx_=_areteIdx;
  }
  
  /**
   * @return le nombre d'arete
   */
  public int getNbAretes(){
    return areteIdx_.length;
  }
  
  /**
   * @param _i  l'indice local de l'arete
   * @return l'indice global de l'arete _i
   */
  public int getIdxArete(int _i){
    return areteIdx_[_i];
  }
  

}

Index: EfGrid.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfGrid.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EfGrid.java	31 Mar 2004 08:14:30 -0000	1.3
--- EfGrid.java	11 Jun 2004 16:32:15 -0000	1.4
***************
*** 1,4 ****
! /*
!  *  @file         H2dMaillage.java
   *  @creation     25 juin 2003
   *  @modification $Date$
--- 1,3 ----
! /**
   *  @creation     25 juin 2003
   *  @modification $Date$
***************
*** 30,38 ****
[...1743 lines suppressed...]
!     n = pts_.length - 1;
!     for (int i = n; i >= 0; i--) {
!       if (!pts_[i].isSame(_m.pts_[i])) return false;
!     }
!     return true;
!   }
! 
!   public void printFrontiere() {
!     ptsFrontiere_.printFullString();
!   }
! 
!   /**
!    * @param _i l'indice du point a modifier
!    * @param _z la nouvelle altitude
!    */
!   public void setZFor(int _i, double _z) {
!     pts_[_i].setZ(_z);
!   }
! }
\ No newline at end of file

Index: EfGridSourcesAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfGridSourcesAbstract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EfGridSourcesAbstract.java	12 Feb 2004 15:32:44 -0000	1.1
--- EfGridSourcesAbstract.java	11 Jun 2004 16:32:15 -0000	1.2
***************
*** 25,29 ****
  
    public int getTimeStepNb() {
!     return 1;
    }
  
--- 25,29 ----
  
    public int getTimeStepNb() {
!     return 0;
    }
  

--- NEW FILE: EfGridVolume.java ---
/**
 *  @creation     9 juin 2004
 *  @modification $Date: 2004/06/11 16:32:15 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.dodico.ef;


/**
 * Un maillage utilisant des elements avec des aretes
 * @author Fred Deniger
 * @version $Id: EfGridVolume.java,v 1.1 2004/06/11 16:32:15 deniger Exp $
 */
public class EfGridVolume extends EfGrid {
  
  EfSegment[] aretes_;


  /**
   * @param _pts
   * @param _elts
   */
  public EfGridVolume(EfNode[] _pts, EfElementVolume[] _elts,EfSegment[] _aretes) {
    super(_pts, _elts);
    aretes_=_aretes;
  }
  
  /**
   * @return le nombre d'arete
   */
  public int getNbAretes(){
    return aretes_.length;
  }
  
  public EfSegment getArete(int _idx){
    return aretes_[_idx];
  }
  
  /**
   * @param _idx l'indice de l'elt
   * @return l'element "volume" correspondant
   */
  public EfElementVolume getEltVolume(int _idx){
    return (EfElementVolume)getElement(_idx);
  }

}

--- EfdSegment.java DELETED ---

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

Index: EfLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfLib.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EfLib.java	12 Feb 2004 15:32:44 -0000	1.1
--- EfLib.java	11 Jun 2004 16:32:15 -0000	1.2
***************
*** 68,72 ****
      int n0, n1, n2, n3, n4, n5;
      //stocke tempo le segment en cours.
!     EfdSegment s= new EfdSegment(0, 0);
      //l'avancement
      ProgressionUpdater pu= new ProgressionUpdater(_progress);
--- 68,72 ----
      int n0, n1, n2, n3, n4, n5;
      //stocke tempo le segment en cours.
!     EfSegment s= new EfSegment(0, 0);
      //l'avancement
      ProgressionUpdater pu= new ProgressionUpdater(_progress);
***************
*** 90,94 ****
          n1= npoint;
          //on recupere la correspondance segment -> index
!         segmentPtIdx.put(new EfdSegment(s), npoint++);
        }
        //point 3
--- 90,94 ----
          n1= npoint;
          //on recupere la correspondance segment -> index
!         segmentPtIdx.put(new EfSegment(s), npoint++);
        }
        //point 3
***************
*** 100,104 ****
          t6points.add(_init.getMilieu(n2, n4));
          n3= npoint;
!         segmentPtIdx.put(new EfdSegment(s), npoint++);
        }
        //point 5
--- 100,104 ----
          t6points.add(_init.getMilieu(n2, n4));
          n3= npoint;
!         segmentPtIdx.put(new EfSegment(s), npoint++);
        }
        //point 5
***************
*** 110,114 ****
          t6points.add(_init.getMilieu(n4, n0));
          n5= npoint;
!         segmentPtIdx.put(new EfdSegment(s), npoint++);
        }
        //on cree l'element
--- 110,114 ----
          t6points.add(_init.getMilieu(n4, n0));
          n5= npoint;
!         segmentPtIdx.put(new EfSegment(s), npoint++);
        }
        //on cree l'element

--- NEW FILE: EfSegmentMutable.java ---
/**
 *  @creation     8 juin 2004
 *  @modification $Date: 2004/06/11 16:32:15 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.dodico.ef;


/**
 * @author Fred Deniger
 * @version $Id: EfSegmentMutable.java,v 1.1 2004/06/11 16:32:15 deniger Exp $
 */
public class EfSegmentMutable extends EfSegment {

  /**
   * @param _pt1
   * @param _pt2
   */
  public EfSegmentMutable(int _pt1, int _pt2) {
    super(_pt1, _pt2);
  }

  /**
   * @param _s
   */
  public EfSegmentMutable(EfSegment _s) {
    super(_s);
  }
  
  
  /**
   * @see org.fudaa.dodico.ef.EfSegment#setPt1Idx(int)
   */
  public void setPt1Idx(int _i) {
    super.setPt1Idx(_i);
  }
  /**
   * @see org.fudaa.dodico.ef.EfSegment#setPt2Idx(int)
   */
  public void setPt2Idx(int _i) {
    super.setPt2Idx(_i);
  }
}

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/ef EfSegment.java,NONE,1.1 EfSegmentMutab

https://gitlab.com/fudaa

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/ef EfSegment.java,NONE,1.1 EfSegmentMutable.java,NONE,1.1 EfGridVolume.java,NONE,1.1 EfElementVolume.java,NONE,1.1 EfGrid.java,1.3,1.4 EfLib.java,1.1,1.2 EfGridSourcesAbstract.java,1.1,1.2 EfdSegment.java,1.1,NONE