[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux H2dRefluxBordIndexGeneral.java,NONE,1.1 H2dRefluxBordManager.java,NONE,1.1 H2dRefluxConditionLimite.java,NONE,1.1 H2dRefluxConditionLimiteMutable.java,NONE,1.1 H2dRefluxDicoModel.java,NONE,1.1 H2dRefluxParametres.java,NONE,1.1 H2dRefluxParametresCalcul.java,NONE,1.1 H2dRefluxSourceInterface.java,NONE,1.1

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

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

Added Files:
	H2dRefluxBordIndexGeneral.java H2dRefluxBordManager.java 
	H2dRefluxConditionLimite.java 
	H2dRefluxConditionLimiteMutable.java H2dRefluxDicoModel.java 
	H2dRefluxParametres.java H2dRefluxParametresCalcul.java 
	H2dRefluxSourceInterface.java 
Log Message:
Creation des dossiers h2d/reflux et h2d/telemac et deplacement des 
fichiers concerne.
Gestion des cl et des bords ( a refaire ..)
Amelioration des gestions des versions de fichiers


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

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

--- NEW FILE: H2dRefluxConditionLimite.java ---
/*
 *  @file         H2dConditionLimiteReflux.java
 *  @creation     25 juin 2003
 *  @modification $Date: 2003/08/22 15:51:12 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
package org.fudaa.dodico.h2d.reflux;

import org.fudaa.dodico.h2d.H2dConditionLimite;
import org.fudaa.dodico.h2d.H2dEvolution;
import org.fudaa.dodico.h2d.type.H2dClType;

/**
 * @author deniger
 * @version $Id: H2dRefluxConditionLimite.java,v 1.1 2003/08/22 15:51:12 deniger Exp $
 */
public class H2dRefluxConditionLimite extends H2dConditionLimite {

  double normale_;
  H2dClType qType_;
  H2dEvolution uTransitoireCourbe_;
  H2dEvolution vTransitoireCourbe_;
  H2dEvolution hTransitoireCourbe_;
  H2dEvolution qTransitoireCourbe_;
  double q_;
  double rugosite_;
  H2dClType rugositeType_;
  H2dEvolution rugositeTransitoireCourbe_;

  /**
   * 
   */
  public H2dRefluxConditionLimite() {
    super();
    uType_= H2dClType.LIBRE;
    vType_= H2dClType.LIBRE;
    hType_= H2dClType.LIBRE;
    qType_= H2dClType.LIBRE;
  }

  /**
   *
   */
  public double getNormale() {
    return normale_;
  }

  /**
   *
   */
  public double getQ() {
    return q_;
  }

  /**
   *
   */
  public H2dClType getQType() {
    return qType_;
  }

  /**
   *
   */
  public H2dEvolution getHTransitoireCourbe() {
    return hTransitoireCourbe_;
  }

  /**
   *
   */
  public H2dEvolution getUTransitoireCourbe() {
    return uTransitoireCourbe_;
  }

  /**
   *
   */
  public H2dEvolution getVTransitoireCourbe() {
    return vTransitoireCourbe_;
  }

  /**
   *
   */
  public H2dEvolution getQTransitoireCourbe() {
    return qTransitoireCourbe_;
  }

  /**
   * 1/Strickler
   */
  public double getRugosite() {
    return rugosite_;
  }

  /**
   *
   */
  public H2dEvolution getRugositeTransitoireCourbe() {
    return rugositeTransitoireCourbe_;
  }

  /**
   *
   */
  public H2dClType getRugositeType() {
    return rugositeType_;
  }

}

--- NEW FILE: H2dRefluxConditionLimiteMutable.java ---
/*
 *  @file         H2dConditionLimiteRefluxMutable.java
 *  @creation     26 juin 2003
 *  @modification $Date: 2003/08/22 15:51:12 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
package org.fudaa.dodico.h2d.reflux;

import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.h2d.H2dEvolution;
import org.fudaa.dodico.h2d.type.H2dBordType;
import org.fudaa.dodico.h2d.type.H2dClType;

/**
 * @author deniger
 * @version $Id: H2dRefluxConditionLimiteMutable.java,v 1.1 2003/08/22 15:51:12 deniger Exp $
 */
public class H2dRefluxConditionLimiteMutable extends H2dRefluxConditionLimite
{

  /**
   * 
   */
  public H2dRefluxConditionLimiteMutable()
  {
  }

  /**
   *
   */
  public void setNormale(double _d)
  {
    normale_ = DodicoLib.getAngle(_d);
  }

  /**
   *
   */
  public void setQ(double _d)
  {
    q_ = _d;
  }
  
  /**
   *
   */
  public void setQTransitoireCourbe(H2dEvolution _evolution)
  {
    qTransitoireCourbe_ = _evolution;
  }


  /**
   *
   */
  public void setQType(H2dClType _type)
  {
    qType_ = _type;
  }
  
  


  /**
   *
   */
  public void setH(double _d)
  {
    h_ = _d;
  }

  /**
   *
   */
  public void setHType(H2dClType _type)
  {
    hType_ = _type;
  }

  /**
   *
   */
  public void setIndexPt(int _i)
  {
    indexPt_ = _i;
  }

  /**
   *
   */
  public void setU(double _d)
  {
    u_ = _d;
  }

  /**
   *
   */
  public void setUType(H2dClType _type)
  {
    uType_ = _type;
  }

  /**
   *
   */
  public void setV(double _d)
  {
    v_ = _d;
  }

  /**
   *
   */
  public void setVType(H2dClType _type)
  {
    vType_ = _type;
  }
  
  /**
   *
   */
  public void setHTransitoireCourbe(H2dEvolution _reflux)
  {
    hTransitoireCourbe_ = _reflux;
  }

  /**
   *
   */
  public void setUTransitoireCourbe(H2dEvolution _reflux)
  {
    uTransitoireCourbe_ = _reflux;
  }

  /**
   *
   */
  public void setVTransitoireCourbe(H2dEvolution _reflux)
  {
    vTransitoireCourbe_ = _reflux;
  }
  
  /**
   *
   */
  public void setRugosite(double _d)
  {
    rugosite_ = _d;
  }
  
  /**
   *
   */
  public void setRugositeTransitoireCourbe(H2dEvolution _evolution)
  {
    rugositeTransitoireCourbe_ = _evolution;
  }

  /**
   *
   */
  public void setRugositeType(H2dClType _type)
  {
    rugositeType_ = _type;
  }



}

--- NEW FILE: H2dRefluxDicoModel.java ---
/*
 *  @file         H2dRefluxEntiteList.java
 *  @creation     27 juin 2003
 *  @modification $Date: 2003/08/22 15:51:12 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
package org.fudaa.dodico.h2d.reflux;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;

import org.fudaa.dodico.dico.DicoComponentVisitor;
import org.fudaa.dodico.dico.DicoDataType;
import org.fudaa.dodico.dico.DicoDataTypeGenerate;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.dico.DicoEntiteGenerate;
import org.fudaa.dodico.dico.DicoEntiteList;
import org.fudaa.dodico.dico.DicoGenerator;
import org.fudaa.dodico.dico.DicoLanguage;
import org.fudaa.dodico.dico.DicoModelAbstract;

/**
 * @author deniger
 * @version $Id: H2dRefluxDicoModel.java,v 1.1 2003/08/22 15:51:12 deniger Exp $
 */
public class H2dRefluxDicoModel extends DicoModelAbstract
{

  /**
   * 
   */
  public H2dRefluxDicoModel()
  {
    super();
  }

  public H2dRefluxDicoModel(int _languageId)
  {
    super(_languageId);
  }

  

  public DicoEntite[] createEntites()
  {
    DicoEntite[] r = new DicoEntite[18];
    int index = 0;
    DicoDataType.Reel type = new DicoDataType.Reel();
    type.setControle(0, 1);
    String[] t = new String[2];
    t[0] = t[1] = "Convection";
    DicoEntite.Simple ent = new DicoEntite.Simple(t[languageIndex_], type);
    ent.setNiveau(0);
    ent.setIndex(index);
    t[0] = t[1] = "1.0";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Coefficients contribution";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    type = new DicoDataType.Reel();
    type.setControle(0, 1);
    t[0] = t[1] = "Diffusion";
    ent = new DicoEntite.Simple(t[languageIndex_], type);
    ent.setIndex(index);
    ent.setNiveau(0);
    t[0] = t[1] = "1.0";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Coefficients contribution";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    type = new DicoDataType.Reel();
    type.setControle(0, 1);
    t[0] = t[1] = "Continuité linéaire";
    ent = new DicoEntite.Simple(t[languageIndex_], type);
    ent.setIndex(index);
    ent.setNiveau(0);
    t[0] = t[1] = "1.0";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Coefficients contribution";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    type = new DicoDataType.Reel();
    type.setControle(0, 1);
    t[0] = t[1] = "Continuité non linéaire";
    ent = new DicoEntite.Simple(t[languageIndex_], type);
    ent.setIndex(index);
    ent.setNiveau(0);
    t[0] = t[1] = "1.0";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Coefficients contribution";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    type = new DicoDataType.Reel();
    type.setControle(0, 1);
    t[0] = t[1] = "Gravitation";
    ent = new DicoEntite.Simple(t[languageIndex_], type);
    ent.setIndex(index);
    ent.setNiveau(0);
    t[0] = t[1] = "1.0";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Coefficients contribution";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    type = new DicoDataType.Reel();
    type.setControle(0, 1);
    t[0] = t[1] = "Frottement";
    ent = new DicoEntite.Simple(t[languageIndex_], type);
    ent.setIndex(index);
    ent.setNiveau(0);
    t[0] = t[1] = "1.0";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Coefficients contribution";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    type = new DicoDataType.Reel();
    type.setControle(0, 1);
    t[0] = t[1] = "Coriolis";
    ent = new DicoEntite.Simple(t[languageIndex_], type);
    ent.setIndex(index);
    ent.setNiveau(0);
    t[0] = t[1] = "0.0";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Coefficients contribution";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    type = new DicoDataType.Reel();
    type.setControle(0, 1);
    t[0] = t[1] = "Contraintes de radiation";
    ent = new DicoEntite.Simple(t[languageIndex_], type);
    ent.setIndex(index);
    ent.setNiveau(0);
    t[0] = t[1] = "0.0";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Coefficients contribution";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    type = new DicoDataType.Reel();
    type.setControle(0, 1);
    t[0] = t[1] = "Forces du vent";
    ent = new DicoEntite.Simple(t[languageIndex_], type);
    ent.setIndex(index);
    ent.setNiveau(0);
    t[0] = t[1] = "0.0";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Coefficients contribution";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    int imprIndex = 0;
    DicoDataType.Binaire typeBinaire = DicoDataType.Binaire.EMPTY;
    t[0] = t[1] = "DONNEES";
    ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire);
    ent.setNiveau(0);
    ent.setIndex(imprIndex++);
    t[0] = t[1] = "false";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Impression";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    t[0] = t[1] = "POINTEURS";
    ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire);
    ent.setNiveau(0);
    ent.setIndex(imprIndex++);
    t[0] = t[1] = "false";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Impression";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    t[0] = t[1] = "TABLESELEM";
    ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire);
    ent.setNiveau(0);
    ent.setIndex(imprIndex++);
    t[0] = t[1] = "false";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Impression";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    t[0] = t[1] = "TABLESGLOB";
    ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire);
    ent.setNiveau(0);
    ent.setIndex(imprIndex++);
    t[0] = t[1] = "false";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Impression";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    t[0] = t[1] = "CIEL";
    ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire);
    ent.setNiveau(0);
    ent.setIndex(imprIndex++);
    t[0] = t[1] = "false";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Impression";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    t[0] = t[1] = "INITIALISATION";
    ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire);
    ent.setNiveau(0);
    ent.setIndex(imprIndex++);
    t[0] = t[1] = "false";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Impression";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    t[0] = t[1] = "MISE_A_JOUR";
    ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire);
    ent.setNiveau(0);
    ent.setIndex(imprIndex++);
    t[0] = t[1] = "false";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Impression";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    t[0] = t[1] = "RESOLUTION";
    ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire);
    ent.setNiveau(0);
    ent.setIndex(imprIndex++);
    t[0] = t[1] = "false";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Impression";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    t[0] = t[1] = "ITERATION";
    ent = new DicoEntite.Simple(t[languageIndex_], typeBinaire);
    ent.setNiveau(0);
    ent.setIndex(imprIndex++);
    t[0] = t[1] = "false";
    ent.setDefautValue(t[languageIndex_]);
    t[0] = t[1] = "Impression";
    ent.setRubrique(t[languageIndex_]);
    r[index++] = ent.getImmutable();

    return r;
  }

  /**
   *
   */
  protected String[] createNoms()
  {
    System.err.println("non implante");
    return null;
  }

  /**
   *
   */
  public String getCodeName()
  {
    return "reflux";
  }

  /**
   *
   */
  public String getVersion()
  {
    return "5.0";
  }

}

--- NEW FILE: H2dRefluxParametres.java ---
/*
 *  @file         H2dParametresReflux.java
 *  @creation     26 juin 2003
 *  @modification $Date: 2003/08/22 15:51:12 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
package org.fudaa.dodico.h2d.reflux;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;

import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.h2d.H2dBordMutable;
import org.fudaa.dodico.h2d.H2dConditionLimite;
import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dMaillage;
import org.fudaa.dodico.h2d.H2dMaillageFrontiere;
import org.fudaa.dodico.h2d.H2dParametres;
import org.fudaa.dodico.reflux.io.INPFileFormat;
import org.fudaa.dodico.reflux.io.INPInterface;

/**
 * @author deniger
 * @version $Id: H2dRefluxParametres.java,v 1.1 2003/08/22 15:51:12 deniger Exp $
 */
public class H2dRefluxParametres extends H2dParametres {

  H2dRefluxConditionLimite[] cls_;
  DicoParams dicoParams_;
  H2dRefluxBordManager bords_;

  /**
   * 
   */
  private H2dRefluxParametres(H2dMaillage maillage_) {
    super(maillage_);
  }

  public DicoParams getDicoParams() {
    return dicoParams_;
  }

  public H2dRefluxConditionLimite getRefluxCL(int _bordIdx) {
    return cls_[_bordIdx];
  }

  public static H2dRefluxParametres init(
    INPInterface _inter,
    ProgressionInterface _prog,
    INPFileFormat.INPVersion _ft,
    DodicoAnalyze.Editor _analyze) {
    if (_prog != null) {
      _prog.setDesc("Analyse données");
      _prog.setProgression(0);
    }

    H2dRefluxParametres r= new H2dRefluxParametres(_inter.getMaillage());
    r.dicoParams_= new DicoParams(_inter.getEntiteValue(), _ft);
    H2dRefluxConditionLimite[] initCl= _inter.getConditionLimite();
    if (_prog != null) {
      _prog.setProgression(20);
    }
    Arrays.sort(initCl, new H2dConditionLimite.ComparatorIdxPt());
    int[] ptFrontiereIdx= r.maillage_.getPtsFrontiere().getArray();
    if (ptFrontiereIdx.length != initCl.length) {
      _analyze.addError(
        DodicoLib.geti18n("Des conditions limites ne sont" + "pas spécifiées"));
    }
    r.cls_= new H2dRefluxConditionLimite[ptFrontiereIdx.length];
    int n= ptFrontiereIdx.length - 1;
    int idxPt;
    for (int i= n; i >= 0; i--) {
      idxPt= ptFrontiereIdx[i];
      H2dRefluxConditionLimite cl=
        (H2dRefluxConditionLimite)H2dConditionLimite.getCLFast(idxPt, initCl);
      if (cl == null) {
        if (_analyze != null)
          _analyze.addError("Pas de cl pour le point de bord " + i);
        H2dRefluxConditionLimiteMutable clN=
          new H2dRefluxConditionLimiteMutable();
        clN.setIndexPt(idxPt);
        r.cls_[i]= clN;
      } else {
        r.cls_[i]= cl;
      }
    }
    if (_prog != null) {
      _prog.setProgression(60);
    }
    r.bords_=
      H2dRefluxBordManager.init(
        r.maillage_.getPtsFrontiere(),
        _inter.getBords(),
        _analyze);
    if (_prog != null) {
      _prog.setProgression(100);
    }
    System.out.println("FIN ANALYZE donnees");
    return r;
  }

  /**
   *
   */
  public H2dRefluxBordManager getBords() {
    return bords_;
  }

}

--- NEW FILE: H2dRefluxParametresCalcul.java ---
/*
 *  @file         H2dParametresCalculReflux.java
 *  @creation     26 juin 2003
 *  @modification $Date: 2003/08/22 15:51:12 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
package org.fudaa.dodico.h2d.reflux;


/**
 * @author deniger
 * @version $Id: H2dRefluxParametresCalcul.java,v 1.1 2003/08/22 15:51:12 deniger Exp $
 */
public class H2dRefluxParametresCalcul
{
//  HashMap impressionValeur_;
//
//  public H2dParametresCalculReflux()
//  {
//    impression_=new HashSet(H2dRefluxImpressionType.LIST.size());
//  }
//  
//  public void addImpression(H2dRefluxImpressionType _s)
//  {
//    impression_.add(_s);
//  }
//  
//  public void addImpression(String _refluxId)
//  {
//    H2dRefluxImpressionType type=H2dRefluxImpressionType.getTypeForRefluxId(_refluxId);
//    if(type!=null) impression_.add(type);
//  }
//  
//  public int getImpressionNb()
//  {
//    return impression_.size();
//  }
//  
//  public H2dRefluxImpressionType[] getImpression()
//  {
//    H2dRefluxImpressionType[] r=new H2dRefluxImpressionType[impression_.size()];
//    impression_.toArray(r);
//    return r;
//  }
//  
//  public boolean contains(H2dRefluxImpressionType _t)
//  {
//    return impression_.contains(_t);
//  }

}

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