Update Lorene patches

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LORENE/trunk@54 5c1b1641-b641-47ec-b3d9-0f93d4c445ee

2 files changed, 271 insertions, 30 deletions

diff --git a/dist/des.patch b/dist/des.patch
index e967ee1..4ae5739 100644
--- a/dist/des.patch
+++ b/dist/des.patch
@@ -1,10 +1,6 @@
-Index: Lorene/C++/Source/Bin_hor/binhor_hh.C
-===================================================================
-RCS file: /cvsroot/Lorene/C++/Source/Bin_hor/binhor_hh.C,v
-retrieving revision 1.3
-diff -u -r1.3 binhor_hh.C
---- Lorene/C++/Source/Bin_hor/binhor_hh.C	9 Jan 2008 14:28:58 -0000	1.3
-+++ Lorene/C++/Source/Bin_hor/binhor_hh.C	27 Mar 2014 13:38:39 -0000
+diff -ru Lorene.orig/C++/Source/Bin_hor/binhor_hh.C Lorene/C++/Source/Bin_hor/binhor_hh.C
+--- Lorene.orig/C++/Source/Bin_hor/binhor_hh.C	2008-01-09 15:28:58.000000000 +0100
++++ Lorene/C++/Source/Bin_hor/binhor_hh.C	2014-04-22 19:31:56.000000000 +0200
 @@ -885,7 +885,7 @@
    cout << hole1.mp.phi << endl ;
    cout << hole1.mp.tet << endl ;
@@ -32,13 +28,73 @@ diff -u -r1.3 binhor_hh.C
  
  
  }
-Index: Lorene/C++/Source/Isol_hor/init_data.C
-===================================================================
-RCS file: /cvsroot/Lorene/C++/Source/Isol_hor/init_data.C,v
-retrieving revision 1.28
-diff -u -r1.28 init_data.C
---- Lorene/C++/Source/Isol_hor/init_data.C	19 Aug 2008 06:42:00 -0000	1.28
-+++ Lorene/C++/Source/Isol_hor/init_data.C	27 Mar 2014 13:38:39 -0000
+diff -ru Lorene.orig/C++/Source/Binaire/binaire_orbite.C Lorene/C++/Source/Binaire/binaire_orbite.C
+--- Lorene.orig/C++/Source/Binaire/binaire_orbite.C	2011-03-27 18:42:21.000000000 +0200
++++ Lorene/C++/Source/Binaire/binaire_orbite.C	2014-04-22 19:52:45.000000000 +0200
+@@ -176,9 +176,9 @@
+ 				  
+ 	cout << "dloggamdx_c : " <<  factx*loggam.dsdx()(0, 0, 0, 0) << endl ; 
+ 	Scalar stmp(logn_comp) ; 
+-        save_profile(stmp, 0., 10., 0.5*M_PI, 0., "prof_logn.d") ; 
++        //save_profile(stmp, 0., 10., 0.5*M_PI, 0., "prof_logn.d") ; 
+ 	stmp = loggam ; 
+-        save_profile(stmp, 0., 1.8, 0.5*M_PI, 0., "prof_loggam.d") ; 
++        //save_profile(stmp, 0., 1.8, 0.5*M_PI, 0., "prof_loggam.d") ; 
+   
+ 	//----------------------------------
+ 	// Calcul de A^2/N^2 au centre de l'etoile ---> asn2[i]
+Only in Lorene/C++/Source/Binaire: binaire_orbite.C.~1.5.~
+diff -ru Lorene.orig/C++/Source/Binary_xcts/binary_orbit_xcts.C Lorene/C++/Source/Binary_xcts/binary_orbit_xcts.C
+--- Lorene.orig/C++/Source/Binary_xcts/binary_orbit_xcts.C	2011-03-30 15:14:27.000000000 +0200
++++ Lorene/C++/Source/Binary_xcts/binary_orbit_xcts.C	2014-04-22 19:53:10.000000000 +0200
+@@ -145,8 +145,8 @@
+ 	Scalar tgraph = logn - log( (1. + et[i]->get_chi_auto()) / (1. + et[i]->get_Psi_auto()) ) ; 
+ 	// tmp = log( (1. + et[i]->get_chi_comp()) / (1. + et[i]->get_Psi_comp()) ) ; 
+ 	tgraph.std_spectral_base() ; 
+-        save_profile(tgraph, 0., 10., 0.5*M_PI, 0., "prof_logn.d") ; 
+-        save_profile(et[i]->get_loggam(), 0., 1.8, 0.5*M_PI, 0., "prof_loggam.d") ;
++        //save_profile(tgraph, 0., 10., 0.5*M_PI, 0., "prof_logn.d") ; 
++        //save_profile(et[i]->get_loggam(), 0., 1.8, 0.5*M_PI, 0., "prof_loggam.d") ;
+  
+ 	//------------------------------------------------------------------
+ 	// Psi^4/N^2 = in the center of the star ---> asn2[i]
+Only in Lorene/C++/Source/Binary_xcts: binary_orbit_xcts.C.~1.11.~
+diff -ru Lorene.orig/C++/Source/Gravastar/gravastar_equil.C Lorene/C++/Source/Gravastar/gravastar_equil.C
+--- Lorene.orig/C++/Source/Gravastar/gravastar_equil.C	2010-10-20 11:32:46.000000000 +0200
++++ Lorene/C++/Source/Gravastar/gravastar_equil.C	2014-04-22 19:48:31.000000000 +0200
+@@ -639,7 +639,7 @@
+ 	    double mlngamma_c = 0 ;*/
+ 
+ 	    //des_profile(nuf,0.,10.,1.5708,0.,"nuf");
+-	    des_profile(nuf,0.,10.,1.5708,0.,"nuf (debut step suivant)");
++	    //des_profile(nuf,0.,10.,1.5708,0.,"nuf (debut step suivant)");
+ 
+ 	    //des_profile(nuq,0.,10.,0.,0.,"nuq");
+ 	    //des_profile(logn,0.,10.,0.,0.,"nu");
+@@ -705,8 +705,8 @@
+ 	    //ent.annule(nzet,nz-1); //***NB: si je le mets, erreur division par zero dans le remapping
+ 
+ 	    //des_profile(logn,0.,10.,0.,0.,"nu");
+-	    des_profile(ent,0.,10.,0.,0.,"enthalpy apres cst");
+-	    des_profile(ent,1.001,1.2,0.,0.,"enthalpy apres zoom");
++	    //des_profile(ent,0.,10.,0.,0.,"enthalpy apres cst");
++	    //des_profile(ent,1.001,1.2,0.,0.,"enthalpy apres zoom");
+ 
+ 	    // Test: is the enthalpy negative somewhere in the equatorial plane
+ 	    //  inside the star ? If yes, this means that the Keplerian velocity
+@@ -783,7 +783,7 @@
+ 	//	mp.reevaluate(&mp_prev, nzet+1, cent) ; //***NB: annule le champ (cent) pour les domaines [nzet+1,nz] -> pourquoi mettre nzet+1 et pas nzet???
+ 	mp.reevaluate(&mp_prev, nzet, cent) ;
+ 	ent = cent ; 
+-	des_profile(ent,0.,10.,0.,0.,"enthalpy apres mapping (used for eos)");
++	//des_profile(ent,0.,10.,0.,0.,"enthalpy apres mapping (used for eos)");
+ 
+ 	//----------------------------------------------------
+ 	// Equation of state  
+Only in Lorene/C++/Source/Gravastar: gravastar_equil.C.~1.1.~
+diff -ru Lorene.orig/C++/Source/Isol_hor/init_data.C Lorene/C++/Source/Isol_hor/init_data.C
+--- Lorene.orig/C++/Source/Isol_hor/init_data.C	2008-08-19 08:42:00.000000000 +0200
++++ Lorene/C++/Source/Isol_hor/init_data.C	2014-04-22 19:31:56.000000000 +0200
 @@ -1261,13 +1261,13 @@
  
      for (int mer=0; mer<niter; mer++) {
@@ -69,13 +125,9 @@ diff -u -r1.28 init_data.C
  
  
  	   //Sources
-Index: Lorene/C++/Source/Time_slice/tslice_conf_init.C
-===================================================================
-RCS file: /cvsroot/Lorene/C++/Source/Time_slice/tslice_conf_init.C,v
-retrieving revision 1.11
-diff -u -r1.11 tslice_conf_init.C
---- Lorene/C++/Source/Time_slice/tslice_conf_init.C	20 Oct 2010 07:58:09 -0000	1.11
-+++ Lorene/C++/Source/Time_slice/tslice_conf_init.C	27 Mar 2014 13:38:39 -0000
+diff -ru Lorene.orig/C++/Source/Time_slice/tslice_conf_init.C Lorene/C++/Source/Time_slice/tslice_conf_init.C
+--- Lorene.orig/C++/Source/Time_slice/tslice_conf_init.C	2010-10-20 09:58:09.000000000 +0200
++++ Lorene/C++/Source/Time_slice/tslice_conf_init.C	2014-04-22 19:31:56.000000000 +0200
 @@ -225,7 +225,7 @@
          maxabs(psi_jp1.laplacian() - source_psi,
                  "Absolute error in the resolution of the equation for Psi") ;  
@@ -110,14 +162,69 @@ diff -u -r1.11 tslice_conf_init.C
          // Test:
          Vector test_beta = (beta_jp1.derive_con(ff)).divergence(ff)
              +  0.3333333333333333 * (beta_jp1.divergence(ff)).derive_con(ff) ;
-Index: Lorene/C++/Source/Time_slice/tslice_dirac_max_evolve.C
-===================================================================
-RCS file: /cvsroot/Lorene/C++/Source/Time_slice/tslice_dirac_max_evolve.C,v
-retrieving revision 1.20
-diff -u -r1.20 tslice_dirac_max_evolve.C
---- Lorene/C++/Source/Time_slice/tslice_dirac_max_evolve.C	24 Jan 2013 12:55:18 -0000	1.20
-+++ Lorene/C++/Source/Time_slice/tslice_dirac_max_evolve.C	27 Mar 2014 13:38:39 -0000
-@@ -688,7 +688,7 @@
+diff -ru Lorene.orig/C++/Source/Time_slice/tslice_dirac_max_evolve.C Lorene/C++/Source/Time_slice/tslice_dirac_max_evolve.C
+--- Lorene.orig/C++/Source/Time_slice/tslice_dirac_max_evolve.C	2013-01-24 13:55:18.000000000 +0100
++++ Lorene/C++/Source/Time_slice/tslice_dirac_max_evolve.C	2014-04-22 19:49:33.000000000 +0200
+@@ -394,8 +394,10 @@
+ 	  // Monitoring
+ 	  // ---------- 
+ 	  m_adm.update(adm_mass(), jtime, the_time[jtime]) ;
++          /*
+ 	  if (jt > 0) des_evol(m_adm, "ADM mass", "Variation of ADM mass", 
+ 			       ngraph0_mon, graph_device) ;          
++          */
+ 	  
+ 	  
+ 	  nn_monitor.update(monitor_scalar(nn(), select_scalar), 
+@@ -438,9 +440,11 @@
+ 	    if (xx > max_error) max_error = xx ; 
+ 	  }
+ 	  test_ham_constr.update(max_error, jt_graph, the_time[jtime]) ; 
++          /*
+ 	  if (jt > 0) des_evol(test_ham_constr, "Absolute error", 
+ 			       "Check of Hamiltonian constraint", 
+ 			       ngraph0_mon+1, graph_device) ; 
++          */
+ 	  
+ 	  Tbl tmom = check_momentum_constraint(0x0, cout, verbose) ; 
+             max_error = tmom(0,0) ;
+@@ -449,9 +453,11 @@
+                 if (xx > max_error) max_error = xx ; 
+             }
+             test_mom_constr_r.update(max_error, jt_graph, the_time[jtime]) ; 
++            /*
+             if (jt > 0) des_evol(test_mom_constr_r, "Absolute error", 
+                 "Check of momentum constraint (r comp.)", ngraph0_mon+2, 
+                 graph_device) ; 
++            */
+ 
+             max_error = tmom(1,0) ;
+             for (int l=1; l<nz-1; l++) {    // all domains but the last one
+@@ -459,9 +465,11 @@
+                 if (xx > max_error) max_error = xx ; 
+             }
+             test_mom_constr_t.update(max_error, jt_graph, the_time[jtime]) ; 
++            /*
+             if (jt > 0) des_evol(test_mom_constr_t, "Absolute error", 
+                 "Check of momentum constraint (\\gh comp.)", ngraph0_mon+3,
+                  graph_device) ; 
++            */
+ 
+             max_error = tmom(2,0) ;
+             for (int l=1; l<nz-1; l++) {    // all domains but the last one
+@@ -469,9 +477,11 @@
+                 if (xx > max_error) max_error = xx ; 
+             }
+             test_mom_constr_p.update(max_error, jt_graph, the_time[jtime]) ; 
++            /*
+             if (jt > 0) des_evol(test_mom_constr_p, "Absolute error", 
+                 "Check of momentum constraint (\\gf comp.)", ngraph0_mon+4, 
+                 graph_device) ; 
++            */
+                
+ 	    if (jt>2) {
+ 	      Tbl tevol = check_dynamical_equations(0x0, 0x0, cout, verbose) ;
+@@ -688,7 +698,7 @@
              beta_new = relax * beta_new + (1.-relax) * beta() ;
  	    beta_evol.update(beta_new, jtime, ttime) ;             
  	}    
@@ -126,7 +233,7 @@ diff -u -r1.20 tslice_dirac_max_evolve.C
          des_meridian(vec_X()(1), 0., ray_des, "\\gb\\ur\\d", ngraph0+6,
                       graph_device) ; 
          des_meridian(vec_X()(2), 0., ray_des, "\\gb\\u\\gh\\d", ngraph0+7,
-@@ -713,6 +713,7 @@
+@@ -713,6 +723,7 @@
                       graph_device) ; 
                  
          arrete(nopause) ; 
diff --git a/dist/makesystem.patch b/dist/makesystem.patch
index 982dd3f..f36c1ee 100644
--- a/dist/makesystem.patch
+++ b/dist/makesystem.patch
@@ -1370,6 +1370,73 @@ diff --new-file -ru Lorene.orig/C++/Source/Cmp/Makefile_lib_g Lorene/C++/Source/
  	
  %.o: %.C
  	@$(MAKEDEPEND); \
+diff --new-file -ru Lorene.orig/C++/Source/Compobj/Makefile Lorene/C++/Source/Compobj/Makefile
+--- Lorene.orig/C++/Source/Compobj/Makefile	2006-09-11 13:28:40.000000000 +0200
++++ Lorene/C++/Source/Compobj/Makefile	2014-03-27 15:35:51.672739947 +0100
+@@ -1,22 +1,24 @@
+ SHELL=/bin/sh
+ 
+-include $(HOME_LORENE)/local_settings		  # defines which compiler,...
+-
+-BIN_TOOLS = $(HOME_LORENE)/bin
++include $(HOME_LORENE)/global_settings		  # defines which compiler,...
+ 
+ SRC	= *.C
+ 
+ install: $(SRC) Objects Objects_g
+ 	mkdir -p $(DEPDIR)
+-	echo *C | $(BIN_TOOLS)/pointCpointo > List_obj     # list of *.o files
++	echo 'OBJ = $(patsubst %.C,%.o,$(wildcard *.C))' > List_obj   # list of *.o files
++ifndef DONTBUILDDEBUGLIB
++	touch Objects_g/_rien.o
+ 	mv Objects_g/*.o .
+-	mv _rien.o Objects_g
+ 	$(MAKE) -f Makefile_lib_g
+ 	mv *.o Objects_g
++	rm Objects_g/_rien.o
++endif
++	touch Objects/_rien.o
+ 	mv Objects/*.o .
+-	mv _rien.o Objects
+ 	$(MAKE) -f Makefile_lib
+ 	mv *.o Objects
++	rm Objects/_rien.o
+ 
+ uninstall:
+ 	rm -f *.o
+@@ -27,8 +29,6 @@
+ 
+ Objects:
+ 	mkdir Objects
+-	touch Objects/_rien.o
+ 
+ Objects_g:
+ 	mkdir Objects_g
+-	touch Objects_g/_rien.o
+diff --new-file -ru Lorene.orig/C++/Source/Compobj/Makefile_lib Lorene/C++/Source/Compobj/Makefile_lib
+--- Lorene.orig/C++/Source/Compobj/Makefile_lib	2006-09-11 13:28:40.000000000 +0200
++++ Lorene/C++/Source/Compobj/Makefile_lib	2014-03-27 15:35:51.674739890 +0100
+@@ -8,8 +8,6 @@
+ LIB	  = $(HOME_LORENE)/Lib
+ 
+ $(LIB)/date_mark : $(OBJ)
+-	ar -rv $(LIB)/liblorene.a  $?
+-	$(RANLIB) $(LIB)/liblorene.a
+ 	
+ %.o: %.C
+ 	@$(MAKEDEPEND); \
+diff --new-file -ru Lorene.orig/C++/Source/Compobj/Makefile_lib_g Lorene/C++/Source/Compobj/Makefile_lib_g
+--- Lorene.orig/C++/Source/Compobj/Makefile_lib_g	2006-09-11 13:28:41.000000000 +0200
++++ Lorene/C++/Source/Compobj/Makefile_lib_g	2014-03-27 15:35:51.677739804 +0100
+@@ -8,8 +8,6 @@
+ LIB	  = $(HOME_LORENE)/Lib
+ 
+ $(LIB)/date_mark : $(OBJ)
+-	ar -rv $(LIB)/liblorene_g.a  $?
+-	$(RANLIB) $(LIB)/liblorene_g.a
+ 	
+ %.o: %.C
+ 	@$(MAKEDEPEND); \
 diff --new-file -ru Lorene.orig/C++/Source/Connection/Makefile Lorene/C++/Source/Connection/Makefile
 --- Lorene.orig/C++/Source/Connection/Makefile	2006-09-11 13:28:42.000000000 +0200
 +++ Lorene/C++/Source/Connection/Makefile	2014-03-27 15:35:51.681739690 +0100
@@ -1849,6 +1916,73 @@ diff --new-file -ru Lorene.orig/C++/Source/Excised_slice/Makefile_lib_g Lorene/C
  	
  %.o: %.C
  	@$(MAKEDEPEND); \
+diff --new-file -ru Lorene.orig/C++/Source/Gravastar/Makefile Lorene/C++/Source/Gravastar/Makefile
+--- Lorene.orig/C++/Source/Gravastar/Makefile	2006-09-11 13:28:48.000000000 +0200
++++ Lorene/C++/Source/Gravastar/Makefile	2014-03-27 15:35:51.739738035 +0100
+@@ -1,22 +1,24 @@
+ SHELL=/bin/sh
+ 
+-include $(HOME_LORENE)/local_settings		  # defines which compiler,...
+-
+-BIN_TOOLS = $(HOME_LORENE)/bin
++include $(HOME_LORENE)/global_settings		  # defines which compiler,...
+ 
+ SRC	= *.C
+ 
+ install: $(SRC) Objects Objects_g
+ 	mkdir -p $(DEPDIR)
+-	echo *C | $(BIN_TOOLS)/pointCpointo > List_obj     # list of *.o files
++	echo 'OBJ = $(patsubst %.C,%.o,$(wildcard *.C))' > List_obj   # list of *.o files
++ifndef DONTBUILDDEBUGLIB
++	touch Objects_g/_rien.o
+ 	mv Objects_g/*.o .
+-	mv _rien.o Objects_g
+ 	$(MAKE) -f Makefile_lib_g
+ 	mv *.o Objects_g
++	rm Objects_g/_rien.o
++endif
++	touch Objects/_rien.o
+ 	mv Objects/*.o .
+-	mv _rien.o Objects
+ 	$(MAKE) -f Makefile_lib
+ 	mv *.o Objects
++	rm Objects/_rien.o
+ 
+ uninstall:
+ 	rm -f *.o
+@@ -27,8 +29,6 @@
+ 
+ Objects:
+ 	mkdir Objects
+-	touch Objects/_rien.o
+ 
+ Objects_g:
+ 	mkdir Objects_g
+-	touch Objects_g/_rien.o
+diff --new-file -ru Lorene.orig/C++/Source/Gravastar/Makefile_lib Lorene/C++/Source/Gravastar/Makefile_lib
+--- Lorene.orig/C++/Source/Gravastar/Makefile_lib	2006-09-11 13:28:48.000000000 +0200
++++ Lorene/C++/Source/Gravastar/Makefile_lib	2014-03-27 15:35:51.742737949 +0100
+@@ -8,8 +8,6 @@
+ LIB	  = $(HOME_LORENE)/Lib
+ 
+ $(LIB)/date_mark : $(OBJ)
+-	ar -rv $(LIB)/liblorene.a  $?
+-	$(RANLIB) $(LIB)/liblorene.a
+ 	
+ %.o: %.C
+ 	@$(MAKEDEPEND); \
+diff --new-file -ru Lorene.orig/C++/Source/Gravastar/Makefile_lib_g Lorene/C++/Source/Gravastar/Makefile_lib_g
+--- Lorene.orig/C++/Source/Gravastar/Makefile_lib_g	2006-09-11 13:28:49.000000000 +0200
++++ Lorene/C++/Source/Gravastar/Makefile_lib_g	2014-03-27 15:35:51.745737864 +0100
+@@ -8,8 +8,6 @@
+ LIB	  = $(HOME_LORENE)/Lib
+ 
+ $(LIB)/date_mark : $(OBJ)
+-	ar -rv $(LIB)/liblorene_g.a  $?
+-	$(RANLIB) $(LIB)/liblorene_g.a
+ 	
+ %.o: %.C
+ 	@$(MAKEDEPEND); \
 diff --new-file -ru Lorene.orig/C++/Source/Grille3d/Makefile Lorene/C++/Source/Grille3d/Makefile
 --- Lorene.orig/C++/Source/Grille3d/Makefile	2006-09-11 13:28:48.000000000 +0200
 +++ Lorene/C++/Source/Grille3d/Makefile	2014-03-27 15:35:51.739738035 +0100