Thread: [Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d CConversionHydrau

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/lido/conversion/hydro1d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1703/src/org/fudaa/dodico/lido/conversion/hydro1d

Modified Files:
	CConversionHydraulique1dGeneral.java 
	CConversionHydraulique1dReseau.java 
	CConversionHydraulique1dHydro.java 
	CConversionHydraulique1dResultatsReseau.java 
	CConversionHydraulique1dResultats.java 
Log Message:
Changement des classes OLB en Olb
Reintegration du package usine

Index: CConversionHydraulique1dResultats.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d/CConversionHydraulique1dResultats.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CConversionHydraulique1dResultats.java	27 Apr 2004 16:34:23 -0000	1.7
--- CConversionHydraulique1dResultats.java	30 Apr 2004 07:18:35 -0000	1.8
***************
*** 8,12 ****
   */
  package org.fudaa.dodico.lido.conversion.hydro1d;
- import org.fudaa.dodico.boony.BoonyLib;
  import org.fudaa.dodico.corba.objet.*;
  import org.fudaa.dodico.corba.hydraulique1d.*;
--- 8,11 ----
***************
*** 60,64 ****
    private IDescriptionVariable[] ecritVariables() {
      IDescriptionVariable[] desc= new IDescriptionVariable[14];
!     desc[0]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[0].nom("Z");
      desc[0].description("Ligne d'eau");
--- 59,63 ----
    private IDescriptionVariable[] ecritVariables() {
      IDescriptionVariable[] desc= new IDescriptionVariable[14];
!     desc[0]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[0].nom("Z");
      desc[0].description("Ligne d'eau");
***************
*** 66,70 ****
      desc[0].type(LTypeNombre.REEL);
      desc[0].nbDecimales(3);
!     desc[1]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[1].nom("Y");
      desc[1].description("Hauteur d'eau");
--- 65,69 ----
      desc[0].type(LTypeNombre.REEL);
      desc[0].nbDecimales(3);
!     desc[1]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[1].nom("Y");
      desc[1].description("Hauteur d'eau");
***************
*** 72,76 ****
      desc[1].type(LTypeNombre.REEL);
      desc[1].nbDecimales(3);
!     desc[2]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[2].nom("S1");
      desc[2].description("Section mouillée (lit mineur)");
--- 71,75 ----
      desc[1].type(LTypeNombre.REEL);
      desc[1].nbDecimales(3);
!     desc[2]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[2].nom("S1");
      desc[2].description("Section mouillée (lit mineur)");
***************
*** 78,82 ****
      desc[2].type(LTypeNombre.REEL);
      desc[2].nbDecimales(3);
!     desc[3]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[3].nom("S2");
      desc[3].description("Section mouillée (lit majeur)");
--- 77,81 ----
      desc[2].type(LTypeNombre.REEL);
      desc[2].nbDecimales(3);
!     desc[3]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[3].nom("S2");
      desc[3].description("Section mouillée (lit majeur)");
***************
*** 84,88 ****
      desc[3].type(LTypeNombre.REEL);
      desc[3].nbDecimales(3);
!     desc[4]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[4].nom("R1");
      desc[4].description("Rayon hydraulique (lit mineur)");
--- 83,87 ----
      desc[3].type(LTypeNombre.REEL);
      desc[3].nbDecimales(3);
!     desc[4]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[4].nom("R1");
      desc[4].description("Rayon hydraulique (lit mineur)");
***************
*** 90,94 ****
      desc[4].type(LTypeNombre.REEL);
      desc[4].nbDecimales(3);
!     desc[5]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[5].nom("R2");
      desc[5].description("Rayon hydraulique (lit majeur)");
--- 89,93 ----
      desc[4].type(LTypeNombre.REEL);
      desc[4].nbDecimales(3);
!     desc[5]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[5].nom("R2");
      desc[5].description("Rayon hydraulique (lit majeur)");
***************
*** 96,100 ****
      desc[5].type(LTypeNombre.REEL);
      desc[5].nbDecimales(3);
!     desc[6]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[6].nom("B1");
      desc[6].description("Largeur au miroir");
--- 95,99 ----
      desc[5].type(LTypeNombre.REEL);
      desc[5].nbDecimales(3);
!     desc[6]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[6].nom("B1");
      desc[6].description("Largeur au miroir");
***************
*** 102,106 ****
      desc[6].type(LTypeNombre.REEL);
      desc[6].nbDecimales(3);
!     desc[7]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[7].nom("VMIN");
      desc[7].description("Vitesse (lit mineur)");
--- 101,105 ----
      desc[6].type(LTypeNombre.REEL);
      desc[6].nbDecimales(3);
!     desc[7]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[7].nom("VMIN");
      desc[7].description("Vitesse (lit mineur)");
***************
*** 108,112 ****
      desc[7].type(LTypeNombre.REEL);
      desc[7].nbDecimales(3);
!     desc[8]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[8].nom("VMAJ");
      desc[8].description("Vitesse (lit majeur)");
--- 107,111 ----
      desc[7].type(LTypeNombre.REEL);
      desc[7].nbDecimales(3);
!     desc[8]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[8].nom("VMAJ");
      desc[8].description("Vitesse (lit majeur)");
***************
*** 114,118 ****
      desc[8].type(LTypeNombre.REEL);
      desc[8].nbDecimales(3);
!     desc[9]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[9].nom("Q");
      desc[9].description("Débit total");
--- 113,117 ----
      desc[8].type(LTypeNombre.REEL);
      desc[8].nbDecimales(3);
!     desc[9]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[9].nom("Q");
      desc[9].description("Débit total");
***************
*** 120,124 ****
      desc[9].type(LTypeNombre.REEL);
      desc[9].nbDecimales(3);
!     desc[10]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[10].nom("FROUDE");
      desc[10].description("Nombre de Froude");
--- 119,123 ----
      desc[9].type(LTypeNombre.REEL);
      desc[9].nbDecimales(3);
!     desc[10]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[10].nom("FROUDE");
      desc[10].description("Nombre de Froude");
***************
*** 126,130 ****
      desc[10].type(LTypeNombre.REEL);
      desc[10].nbDecimales(3);
!     desc[11]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[11].nom("QMIN");
      desc[11].description("Débit (lit mineur)");
--- 125,129 ----
      desc[10].type(LTypeNombre.REEL);
      desc[10].nbDecimales(3);
!     desc[11]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[11].nom("QMIN");
      desc[11].description("Débit (lit mineur)");
***************
*** 132,136 ****
      desc[11].type(LTypeNombre.REEL);
      desc[11].nbDecimales(3);
!     desc[12]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[12].nom("QMAJ");
      desc[12].description("Débit (lit majeur)");
--- 131,135 ----
      desc[11].type(LTypeNombre.REEL);
      desc[11].nbDecimales(3);
!     desc[12]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[12].nom("QMAJ");
      desc[12].description("Débit (lit majeur)");
***************
*** 138,142 ****
      desc[12].type(LTypeNombre.REEL);
      desc[12].nbDecimales(3);
!     desc[13]= BoonyLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[13].nom("CHARGE");
      desc[13].description("Charge");
--- 137,141 ----
      desc[12].type(LTypeNombre.REEL);
      desc[12].nbDecimales(3);
!     desc[13]= UsineLib.findUsine().creeHydraulique1dDescriptionVariable();
      desc[13].nom("CHARGE");
      desc[13].description("Charge");

Index: CConversionHydraulique1dGeneral.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d/CConversionHydraulique1dGeneral.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CConversionHydraulique1dGeneral.java	27 Apr 2004 16:34:23 -0000	1.6
--- CConversionHydraulique1dGeneral.java	30 Apr 2004 07:18:35 -0000	1.7
***************
*** 10,14 ****
  import java.util.*;
  
- import org.fudaa.dodico.boony.BoonyLib;
  import org.fudaa.dodico.corba.objet.*;
  import org.fudaa.dodico.corba.hydraulique1d.*;
--- 10,13 ----
***************
*** 122,126 ****
      SParametresSerieBlocCAL series) {
      IDefinitionSectionsParSeries sections=
!       BoonyLib.findUsine().creeHydraulique1dDefinitionSectionsParSeries();
      sections.surProfils(true);
      IDefinitionSectionsParSeriesUnitaire[] unitaires=
--- 121,125 ----
      SParametresSerieBlocCAL series) {
      IDefinitionSectionsParSeries sections=
!       UsineLib.findUsine().creeHydraulique1dDefinitionSectionsParSeries();
      sections.surProfils(true);
      IDefinitionSectionsParSeriesUnitaire[] unitaires=
***************
*** 136,143 ****
        }
        unitaires[i]=
!         BoonyLib
            .findUsine()
            .creeHydraulique1dDefinitionSectionsParSeriesUnitaire();
!       IZone zone= BoonyLib.findUsine().creeHydraulique1dZone();
        zone.abscisseDebut(series.ligne[i].absDebBief);
        zone.abscisseFin(series.ligne[i].absFinBief);
--- 135,142 ----
        }
        unitaires[i]=
!         UsineLib
            .findUsine()
            .creeHydraulique1dDefinitionSectionsParSeriesUnitaire();
!       IZone zone= UsineLib.findUsine().creeHydraulique1dZone();
        zone.abscisseDebut(series.ligne[i].absDebBief);
        zone.abscisseFin(series.ligne[i].absFinBief);
***************
*** 154,158 ****
      SParametresSectionBlocCAL _sections) {
      IDefinitionSectionsParSections sections=
!       BoonyLib.findUsine().creeHydraulique1dDefinitionSectionsParSections();
      ISite[] unitaires= new ISite[_sections.nbSect];
      for (int i= 0; i < _sections.nbSect; i++) {
--- 153,157 ----
      SParametresSectionBlocCAL _sections) {
      IDefinitionSectionsParSections sections=
!       UsineLib.findUsine().creeHydraulique1dDefinitionSectionsParSections();
      ISite[] unitaires= new ISite[_sections.nbSect];
      for (int i= 0; i < _sections.nbSect; i++) {
***************
*** 165,169 ****
              "profil " + _sections.ligne[i].absSect + ": aucun bief associe"));
        }
!       unitaires[i]= BoonyLib.findUsine().creeHydraulique1dSite();
        unitaires[i].abscisse(_sections.ligne[i].absSect);
        unitaires[i].biefRattache(bief);
--- 164,168 ----
              "profil " + _sections.ligne[i].absSect + ": aucun bief associe"));
        }
!       unitaires[i]= UsineLib.findUsine().creeHydraulique1dSite();
        unitaires[i].abscisse(_sections.ligne[i].absSect);
        unitaires[i].biefRattache(bief);

Index: CConversionHydraulique1dHydro.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d/CConversionHydraulique1dHydro.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CConversionHydraulique1dHydro.java	27 Apr 2004 16:34:23 -0000	1.6
--- CConversionHydraulique1dHydro.java	30 Apr 2004 07:18:35 -0000	1.7
***************
*** 10,14 ****
  import java.util.*;
  
- import org.fudaa.dodico.boony.BoonyLib;
  import org.fudaa.dodico.corba.objet.*;
  import org.fudaa.dodico.corba.hydraulique1d.*;
--- 10,13 ----
***************
*** 53,57 ****
      for (int i= 0; i < points.length; i++) {
        IBief bief= reseau.getBiefContenantAbscisse(lig.x[i]);
!       points[i]= BoonyLib.findUsine().creeHydraulique1dLigneEauPoint();
        points[i].numeroBief(bief == null ? -1 : bief.numero());
        points[i].abscisse(lig.x[i]);
--- 52,56 ----
      for (int i= 0; i < points.length; i++) {
        IBief bief= reseau.getBiefContenantAbscisse(lig.x[i]);
!       points[i]= UsineLib.findUsine().creeHydraulique1dLigneEauPoint();
        points[i].numeroBief(bief == null ? -1 : bief.numero());
        points[i].abscisse(lig.x[i]);
***************
*** 62,66 ****
      // LIMITES
      for (int i= 0; i < rzo.nbLimi; i++) {
!       ILimite lim= BoonyLib.findUsine().creeHydraulique1dLimite();
        lim.nom(null);
        lim.typeLimiteCalcule(LLimiteCalcule.EVACUATION_LIBRE);
--- 61,65 ----
      // LIMITES
      for (int i= 0; i < rzo.nbLimi; i++) {
!       ILimite lim= UsineLib.findUsine().creeHydraulique1dLimite();
        lim.nom(null);
        lim.typeLimiteCalcule(LLimiteCalcule.EVACUATION_LIBRE);
***************
*** 108,112 ****
          {
            ILoiHydrogramme cloi=
!             BoonyLib.findUsine().creeHydraulique1dLoiHydrogramme();
            double[] t= new double[loiclm.nbPoints];
            double[] q= new double[loiclm.nbPoints];
--- 107,111 ----
          {
            ILoiHydrogramme cloi=
!             UsineLib.findUsine().creeHydraulique1dLoiHydrogramme();
            double[] t= new double[loiclm.nbPoints];
            double[] q= new double[loiclm.nbPoints];
***************
*** 123,127 ****
          {
            ILoiLimnigramme cloi=
!             BoonyLib.findUsine().creeHydraulique1dLoiLimnigramme();
            double[] t= new double[loiclm.nbPoints];
            double[] z= new double[loiclm.nbPoints];
--- 122,126 ----
          {
            ILoiLimnigramme cloi=
!             UsineLib.findUsine().creeHydraulique1dLoiLimnigramme();
            double[] t= new double[loiclm.nbPoints];
            double[] z= new double[loiclm.nbPoints];
***************
*** 137,141 ****
        case LidoResource.LIMITE.TARAGE :
          {
!           ILoiTarage cloi= BoonyLib.findUsine().creeHydraulique1dLoiTarage();
            double[] z= new double[loiclm.nbPoints];
            double[] q= new double[loiclm.nbPoints];
--- 136,140 ----
        case LidoResource.LIMITE.TARAGE :
          {
!           ILoiTarage cloi= UsineLib.findUsine().creeHydraulique1dLoiTarage();
            double[] z= new double[loiclm.nbPoints];
            double[] q= new double[loiclm.nbPoints];
***************
*** 158,162 ****
        case LidoResource.SINGULARITE.SEUIL_NOYE :
          {
!           ILoiSeuil cloi= BoonyLib.findUsine().creeHydraulique1dLoiSeuil();
            loi= cloi;
            break;
--- 157,161 ----
        case LidoResource.SINGULARITE.SEUIL_NOYE :
          {
!           ILoiSeuil cloi= UsineLib.findUsine().creeHydraulique1dLoiSeuil();
            loi= cloi;
            break;
***************
*** 164,168 ****
        case LidoResource.SINGULARITE.SEUIL_DENOYE :
          {
!           ILoiSeuil cloi= BoonyLib.findUsine().creeHydraulique1dLoiSeuil();
            loi= cloi;
            break;
--- 163,167 ----
        case LidoResource.SINGULARITE.SEUIL_DENOYE :
          {
!           ILoiSeuil cloi= UsineLib.findUsine().creeHydraulique1dLoiSeuil();
            loi= cloi;
            break;
***************
*** 171,175 ****
          {
            ILoiGeometrique cloi=
!             BoonyLib.findUsine().creeHydraulique1dLoiGeometrique();
            loi= cloi;
            break;
--- 170,174 ----
          {
            ILoiGeometrique cloi=
!             UsineLib.findUsine().creeHydraulique1dLoiGeometrique();
            loi= cloi;
            break;
***************
*** 178,182 ****
          {
            ILoiLimnigramme cloi=
!             BoonyLib.findUsine().creeHydraulique1dLoiLimnigramme();
            loi= cloi;
            break;
--- 177,181 ----
          {
            ILoiLimnigramme cloi=
!             UsineLib.findUsine().creeHydraulique1dLoiLimnigramme();
            loi= cloi;
            break;
***************
*** 184,188 ****
        case LidoResource.SINGULARITE.TARAGE_AMONT :
          {
!           ILoiTarage cloi= BoonyLib.findUsine().creeHydraulique1dLoiTarage();
            cloi.amont(true);
            loi= cloi;
--- 183,187 ----
        case LidoResource.SINGULARITE.TARAGE_AMONT :
          {
!           ILoiTarage cloi= UsineLib.findUsine().creeHydraulique1dLoiTarage();
            cloi.amont(true);
            loi= cloi;
***************
*** 191,195 ****
        case LidoResource.SINGULARITE.TARAGE_AVAL :
          {
!           ILoiTarage cloi= BoonyLib.findUsine().creeHydraulique1dLoiTarage();
            cloi.amont(false);
            loi= cloi;
--- 190,194 ----
        case LidoResource.SINGULARITE.TARAGE_AVAL :
          {
!           ILoiTarage cloi= UsineLib.findUsine().creeHydraulique1dLoiTarage();
            cloi.amont(false);
            loi= cloi;

Index: CConversionHydraulique1dResultatsReseau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d/CConversionHydraulique1dResultatsReseau.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CConversionHydraulique1dResultatsReseau.java	27 Apr 2004 16:34:23 -0000	1.6
--- CConversionHydraulique1dResultatsReseau.java	30 Apr 2004 07:18:35 -0000	1.7
***************
*** 10,14 ****
  import java.util.*;
  
- import org.fudaa.dodico.boony.BoonyLib;
  import org.fudaa.dodico.corba.objet.*;
  import org.fudaa.dodico.objet.*;
--- 10,13 ----
***************
*** 46,52 ****
          new IResultatsBiefPasTemps[rsn.pasTemps.length];
        for (int t= 0; t < pas.length; t++) {
!         pas[t]= BoonyLib.findUsine().creeHydraulique1dResultatsBiefPasTemps();
          IInformationTemps it=
!           BoonyLib.findUsine().creeHydraulique1dInformationTemps();
          it.info(rsn.pasTemps[t].info);
          it.numeroPas(rsn.pasTemps[t].np);
--- 45,51 ----
          new IResultatsBiefPasTemps[rsn.pasTemps.length];
        for (int t= 0; t < pas.length; t++) {
!         pas[t]= UsineLib.findUsine().creeHydraulique1dResultatsBiefPasTemps();
          IInformationTemps it=
!           UsineLib.findUsine().creeHydraulique1dInformationTemps();
          it.info(rsn.pasTemps[t].info);
          it.numeroPas(rsn.pasTemps[t].np);
***************
*** 71,75 ****
          sections= new ISectionCalculee[rsn.pasTemps[0].ligBief[i].ligne.length];
          for (int j= 0; j < sections.length; j++) {
!           sections[j]= BoonyLib.findUsine().creeHydraulique1dSectionCalculee();
            sections[j].abscisse(rsn.pasTemps[0].ligBief[i].ligne[j].x);
            ISectionCalculeePasTemps[] pasSection=
--- 70,74 ----
          sections= new ISectionCalculee[rsn.pasTemps[0].ligBief[i].ligne.length];
          for (int j= 0; j < sections.length; j++) {
!           sections[j]= UsineLib.findUsine().creeHydraulique1dSectionCalculee();
            sections[j].abscisse(rsn.pasTemps[0].ligBief[i].ligne[j].x);
            ISectionCalculeePasTemps[] pasSection=
***************
*** 77,81 ****
            for (int t= 0; t < pasSection.length; t++) {
              pasSection[t]=
!               BoonyLib.findUsine().creeHydraulique1dSectionCalculeePasTemps();
              pasSection[t].infoTemps(
                biefs[i].resultatsBief().pasTemps()[t].infoTemps());
--- 76,80 ----
            for (int t= 0; t < pasSection.length; t++) {
              pasSection[t]=
!               UsineLib.findUsine().creeHydraulique1dSectionCalculeePasTemps();
              pasSection[t].infoTemps(
                biefs[i].resultatsBief().pasTemps()[t].infoTemps());

Index: CConversionHydraulique1dReseau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d/CConversionHydraulique1dReseau.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CConversionHydraulique1dReseau.java	27 Apr 2004 16:34:23 -0000	1.6
--- CConversionHydraulique1dReseau.java	30 Apr 2004 07:18:35 -0000	1.7
***************
*** 10,14 ****
  import java.util.*;
  
- import org.fudaa.dodico.boony.BoonyLib;
  import org.fudaa.dodico.corba.objet.*;
  import org.fudaa.dodico.objet.*;
--- 10,13 ----
***************
*** 45,49 ****
      IEtude1d etude= calculHydraulique1d_.etude();
      if (etude == null) {
!       etude= BoonyLib.findUsine().creeHydraulique1dEtude1d();
        calculHydraulique1d_.etude(etude);
      }
--- 44,48 ----
      IEtude1d etude= calculHydraulique1d_.etude();
      if (etude == null) {
!       etude= UsineLib.findUsine().creeHydraulique1dEtude1d();
        calculHydraulique1d_.etude(etude);
      }
***************
*** 53,57 ****
        Vector vstrickMin= new Vector();
        Vector vstrickMaj= new Vector();
!       biefs[i]= BoonyLib.findUsine().creeHydraulique1dBief();
        biefs[i].numero(rzo.blocSitus.ligneSitu[i].numBief);
        for (int j= 0; j < pro.nbProfils; j++) {
--- 52,56 ----
        Vector vstrickMin= new Vector();
        Vector vstrickMaj= new Vector();
!       biefs[i]= UsineLib.findUsine().creeHydraulique1dBief();
        biefs[i].numero(rzo.blocSitus.ligneSitu[i].numBief);
        for (int j= 0; j < pro.nbProfils; j++) {
***************
*** 61,65 ****
              rzo.blocSitus.ligneSitu[i].x1,
              rzo.blocSitus.ligneSitu[i].x2)) {
!           IProfil p= BoonyLib.findUsine().creeHydraulique1dProfil();
            remplitProfil(p, pro.profilsBief[j]);
            vstrickMin.add(new Double(pro.profilsBief[j].coefStrickMajMin));
--- 60,64 ----
              rzo.blocSitus.ligneSitu[i].x1,
              rzo.blocSitus.ligneSitu[i].x2)) {
!           IProfil p= UsineLib.findUsine().creeHydraulique1dProfil();
            remplitProfil(p, pro.profilsBief[j]);
            vstrickMin.add(new Double(pro.profilsBief[j].coefStrickMajMin));
***************
*** 96,100 ****
            || (!CGlobal.egale(strickMajCour, strickMajPrec))) {
            IZoneFrottement zf=
!             BoonyLib.findUsine().creeHydraulique1dZoneFrottement();
            zf.abscisseDebut(biefs[i].profils()[jprec].abscisse());
            zf.abscisseFin(biefs[i].profils()[j].abscisse());
--- 95,99 ----
            || (!CGlobal.egale(strickMajCour, strickMajPrec))) {
            IZoneFrottement zf=
!             UsineLib.findUsine().creeHydraulique1dZoneFrottement();
            zf.abscisseDebut(biefs[i].profils()[jprec].abscisse());
            zf.abscisseFin(biefs[i].profils()[j].abscisse());
***************
*** 117,121 ****
      IReseau reseau= etude.reseau();
      if (reseau == null) {
!       reseau= BoonyLib.findUsine().creeHydraulique1dReseau();
        etude.reseau(reseau);
      }
--- 116,120 ----
      IReseau reseau= etude.reseau();
      if (reseau == null) {
!       reseau= UsineLib.findUsine().creeHydraulique1dReseau();
        etude.reseau(reseau);
      }
***************
*** 123,127 ****
      // NOEUDS
      for (int i= 0; i < rzo.nbNoeud; i++) {
!       INoeud noeud= BoonyLib.findUsine().creeHydraulique1dNoeud();
        noeud.numero(i);
        int nb= 0;
--- 122,126 ----
      // NOEUDS
      for (int i= 0; i < rzo.nbNoeud; i++) {
!       INoeud noeud= UsineLib.findUsine().creeHydraulique1dNoeud();
        noeud.numero(i);
        int nb= 0;

Thread: [Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d CConversionHydrau

https://gitlab.com/fudaa

fudaa-cvs-commit