Changeset 3746 in Sophya for trunk/Cosmo

Timestamp:

Feb 18, 2010, 10:45:29 AM (16 years ago)

Author:

cmv

Message:

correction pour petits cubes (demande assez de pys pour zref_), cmv 18/02/2010

Location:

trunk/Cosmo/SimLSS

Files:

• Makefile (modified) (2 diffs)
• cmvobserv3d.cc (modified) (2 diffs)
• genefluct3d.cc (modified) (2 diffs)

trunk/Cosmo/SimLSS/Makefile

@@ -176 +176 @@
 cmvobserv3d: $(EXE)cmvobserv3d
         echo $@ " done"
-$(EXE)cmvobserv3d: $(OBJ)cmvobserv3d.o $(LIBR)
+$(EXE)cmvobserv3d: $(OBJ)cmvobserv3d.o $(LIBR) $(LIBG)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvobserv3d.o $(MYLIB) 
 $(OBJ)cmvobserv3d.o: cmvobserv3d.cc
@@ -183 +183 @@
 cmvobserv3df: $(EXE)cmvobserv3df
         echo $@ " done"
-$(EXE)cmvobserv3df: $(OBJ)cmvobserv3df.o $(LIBR)
+$(EXE)cmvobserv3df: $(OBJ)cmvobserv3df.o $(LIBR) $(LIBG4)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvobserv3df.o $(MYLIB4) 
 $(OBJ)cmvobserv3df.o: cmvobserv3d.cc

trunk/Cosmo/SimLSS/cmvobserv3d.cc

@@ -245 +245 @@
  }
 
+ //----TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH
+ try {
+ //----TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH
+
  double lschmin=log10(schmin), lschmax=log10(schmax);
  if(schnpt<=0) {  // alors c'est un nombre de points par decade
@@ -790 +794 @@
  PrtTim(">>>> End Of Job");
 
+ //----TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH
+ } catch (PException& exc) {
+   cerr<<"cmvobserv3d.cc catched PException"<<exc.Msg()<<endl;
+   return 77;
+ } catch (std::exception& sex) {
+   cerr << "cmvobserv3d.cc std::exception :" 
+        << (string)typeid(sex).name() << "\n msg= " 
+        << sex.what() << endl;
+   return 78;
+ } catch (...) {
+   cerr << "cmvobserv3d.cc catched unknown (...) exception  " << endl; 
+   return 79;
+ }
+ //----TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH-TRY-CATCH
+
  return 0;
 }

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -307 +307 @@
  // TO BE FIXED TO BE FIXED TO BE FIXED TO BE FIXED TO BE FIXED TO BE FIXED
  if(loscom_min_<=1.e-50)
-   for(int i=0;i<50;i++)
+   for(int i=0;i<10;i++)
      cout<<"ATTENTION TOUTES LES PARTIES DU CODE NE MARCHENT PAS POUR UN OBSERVATEUR DANS LE CUBE"<<endl;
  // TO BE FIXED TO BE FIXED TO BE FIXED TO BE FIXED TO BE FIXED TO BE FIXED
@@ -337 +337 @@
  // Be shure to have one dlc <loscom_min and one >loscom_max
  if(zinc<=0.) zinc = 0.01;
- for(double z=0.; ; z+=zinc) {
-   double dlc = cosmo_->Dloscom(z);
-   if(dlc<loscom_min_) {zred_.resize(0); loscom_.resize(0);}
-   zred_.push_back(z);
-   loscom_.push_back(dlc);
-   z += zinc;
-   if(dlc>loscom_max_) break; // on sort apres avoir stoque un dlc>dlcmax
+ double zmin = 0., dlcmin=0.;
+ while(1) {
+   if(lp_>0)
+     cout<<"...Filling zred starting at zmin="<<zmin<<" with zinc="<<zinc
+         <<", loscom_min-max=["<<loscom_min_<<","<<loscom_max_<<"]"<<endl;
+   zred_.resize(0); loscom_.resize(0);
+   for(double z=zmin; ; z+=zinc) {
+     double dlc = cosmo_->Dloscom(z);
+     if(dlc<loscom_min_) {
+       dlcmin = dlc;
+       zmin = z;
+       zred_.resize(0); loscom_.resize(0);
+     }
+     zred_.push_back(z);
+     loscom_.push_back(dlc);
+     z += zinc;
+     if(dlc>loscom_max_) {
+       if(lp_>0)
+         cout<<"  Min: z="<<zmin<<" dlc="<<dlcmin<<", Max: z="<<z<<" dlc="<<dlc<<endl;
+       break; // on sort apres avoir stoque un dlc>dlcmax
+     }
+   }
+   if(zred_.size()>=10) break;
+   zinc /= 10.;
+   cout<<"  not enough points ("<<zred_.size()<<") for zref, retry with zinc="<<zinc<<endl;
  }