From 8ae665e60ab66b058cb900a62972c564e2eb4593 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 7 Mar 2018 22:34:36 +0100
Subject: [PATCH] fix links

---
 AcousticScattering/infos.xml     |   2 +-
 DDMWaves/README.txt              |   2 +-
 ElectricMachines/README.txt~     | 197 -------------------------------
 ElectricMachines/infos.xml       |   8 +-
 ElectromechanicalRelay/infos.xml |   2 +-
 Inductor/infos.xml               |   2 +-
 Magnetometer/infos.xml           |   2 +-
 Magnets/infos.xml                |   2 +-
 Superconductors/infos.xml        |   2 +-
 ThermalConduction/infos.xml      |   2 +-
 Waveguides/infos.xml             |   8 +-
 11 files changed, 16 insertions(+), 213 deletions(-)
 delete mode 100644 ElectricMachines/README.txt~

diff --git a/AcousticScattering/infos.xml b/AcousticScattering/infos.xml
index 4872ca2..e7c3235 100644
--- a/AcousticScattering/infos.xml
+++ b/AcousticScattering/infos.xml
@@ -6,6 +6,6 @@
 		<summary>2D models of multiple acoustic scattering</summary>
 		<file type="pro">scattering.pro</file>
 		<preview type="png">infos.png</preview>
-		<url>http://onelab.info/wiki/Acoustic_scattering</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Acoustic-scattering</url>
 	</model>
 </models>
diff --git a/DDMWaves/README.txt b/DDMWaves/README.txt
index 5616782..09be8d1 100644
--- a/DDMWaves/README.txt
+++ b/DDMWaves/README.txt
@@ -43,7 +43,7 @@ test-case, on 100 CPUs):
 Additional information
 ----------------------
 
-See http://onelab.info/wiki/GetDDM and http://onelab.info/wiki/DDM_for_Waves.
+See https://gitlab.onelab.info/doc/models/wikis/Domain-decomposition-methods-for-waves.
 
 
 Description of the files in the archive
diff --git a/ElectricMachines/README.txt~ b/ElectricMachines/README.txt~
deleted file mode 100644
index 31c8a57..0000000
--- a/ElectricMachines/README.txt~
+++ /dev/null
@@ -1,197 +0,0 @@
-
-2D models of electric machines: permanent magnet and wound field synchronous
-machines, induction machines, switched reluctance machine.
-
-Models developed by R. Sabariego, J. Gyselinck and C. Geuzaine. This work was
-funded in part by the Walloon Region (WBGreen No 1217703 FEDO, WIST3 No 1017086
-ONELAB) and by the Belgian Science Policy (IAP P7/02). Copyright (c) 2012-2018
-ULiège-ULB.
-
-Quick start
------------
-
-Open `main.pro' with Gmsh.
-
-Additional info
----------------
-
-See http://onelab.info/wiki/Electric_Machines
-
-The directory contains several examples:
-
-* Eight-pole permanent magnet synchronous machine - GRUCAD, Universidade Federal
-  de Santa Catarina, Brazil
-
-  Used in:
-
-  M.V. Ferreira da Luz, P. Dular, N. Sadowski, C. Geuzaine, and J.P.A. Bastos,
-  "Analysis of a permanent magnet generator with dual formulations using
-  periodicity conditions and moving band", IEEE Trans. Mag., IEEE Trans. Mag.,
-  38(2):961-964, 2002.  http://orbi.ulg.ac.be/handle/2268/22771
-
-  Files:
-
-  pmsm_data.geo
-  pmsm.geo
-  pmsm_rotor.geo
-  pmsm_stator.geo
-  pmsm.pro
-  pmsm_8p_circuit.pro
-
-* Eight-pole permanent magnet synchronous machine - GRUCAD, Universidade Federal
-  de Santa Catarina, Brazil Same machine as previous one, but geometry has not
-  been simplified here.
-
-  Used in:
-
-  J. Gyselinck, N. Sadowski, P. Dular, M.V. Ferreira da Luz, J.P.A. Bastos,
-  W. Legros, "Harmonic balance finite element modelling of a permanent-magnet
-  synchronous machine", Proceedings of the V Brazilian Conference on
-  Electromagnetics (CBMag2002), 4-6 November 2002, Gramado, Brazil, 4 p.
-  http://hdl.handle.net/2013/ULB-DIPOT:oai:dipot.ulb.ac.be:2013/73090
-
-  J. Gyselinck, P. Dular, L. Vandevelde and J. Melkebeek, A.M. Oliveira,
-  P. Kuo-Peng, "Two-dimensional harmonic balance finite element modelling of
-  electrical machines taking motion into account", COMPEL: The International
-  Journal for Computation and Mathematics in Electrical and Electronic
-  Engineering, 22(4):1021-1036, 2003.
-  http://hdl.handle.net/2013/ULB-DIPOT:oai:dipot.ulb.ac.be:2013/72981
-  http://www.emeraldinsight.com/journals.htm?articleid=1455338
-
-  Files: 
-  
-  pmsm_cbmab_data.geo
-  pmsm_cbmag.geo
-  pmsm_cbmag_rotor.geo
-  pmsm_cbmag_stator.geo
-  pmsm_cbmag.pro
-  pmsm_8p_circuit.pro
-
-* Eight-pole permanent magnet machine
-
-  Model from:
-
-  E.A. Lomonova, E. Kazmin, Y. Tang, J.J.H. Paulides, "In-wheel PM motor:
-  Compromise between high power density and extended speed capability", COMPEL:
-  The International Journal for Computation and Mathematics in Electrical and
-  Electronic Engineering, 30(1):98-116, 2011.  Work presented at Ecologic
-  Vehicles-Renewable Energies (EVRE), Monaco, March 26-29, 2009
-  http://www.emeraldinsight.com/journals.htm?articleid=1906093
-
-  with Concentrated or distributed windings (different parameters for the geometry)
-
-  Files:
-
-  lomonova_data.geo
-  lomonova.geo
-  lomonova_rotor.geo
-  lomonova_stator.geo
-  lomonova.pro
-  lomonova_circuit.pro
-
-* Four-pole wound field synchronous machine
-
-  Used in:
-
-  J. Gyselinck, L. Vandevelde, J. Melkebeek, W. Legros, "Steady-state finite
-  element analysis of a salient-pole synchronous machine in the frequency
-  domain", Proceedings the 7th International Conference on Modeling and
-  Simulation of Electric Machines, Converters and Systems (ELECTRIMACS2002),
-  August 18-21, Montréal, Canada, 6 p.
-  http://hdl.handle.net/2013/ULB-DIPOT:oai:dipot.ulb.ac.be:2013/73097
-  http://hdl.handle.net/1854/LU-160736
-
-  Files:
-
-  wfsm_4p_data.geo
-  wfsm_4p.geo
-  wfsm_4p_rotor.geo
-  wfsm_4p_stator.geo
-  wfsm_4p.pro
-  wfsm_4p_circuit.pro
-
-* TEAM workshop problem 30a - Induction motor analysis
-
-  See: http://www.compumag.org/jsite/team.html and
-  http://www.infolytica.com/en/applications/ex0035/
-
-  Files:
-
-  t30_data.geo
-  t30.geo
-  t30_rotor.geo
-  t30_stator.geo
-  t30.pro
-
-* Four-pole 3kW-induction machine from Johan Gyselinck's PhD
-
-  J. Gyselinck, "Twee dimensionale dynamische eindige-elementenmodellering van
-  statische en roterende elektromagnetische energieomzetters", Ph.D. thesis,
-  Universiteit Gent, 2000.
-
-  Some articles where it has been used:
-
-  J. Gyselinck, L. Vandevelde, and J. Melkebeek, "Multi-slice modeling of
-  electrical machines with skewed slots - The skew discretization error”, IEEE
-  Trans. Magn., IEEE Trans. Magn., 37(5):3233–3237, 2002.
-  http://hdl.handle.net/2013/ULB-DIPOT:oai:dipot.ulb.ac.be:2013/72985
-  http://hdl.handle.net/1854/LU-144482
-
-  J. Gyselinck, L. Vandevelde, P. Dular, C. Geuzaine, W. Legros, "A general
-  method for the frequency domain FE modeling of rotating electromagnetic
-  devices", IEEE Trans. Magn., 39(3):1147-1150, 2003.
-  http://hdl.handle.net/2013/ULB-DIPOT:oai:dipot.ulb.ac.be:2013/72982
-  http://hdl.handle.net/2268/22767 http://hdl.handle.net/1854/LU-211446
-  http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=1198420
-
-  Files:
-
-  im_3kW_data.geo
-  im_3kW.geo
-  im_3kW_rotor.geo
-  im_3kW_stator.geo
-  im_3kW.pro
-  im_3kW_circuit.pro
-
-* Four-pole induction machine
-
-  Used in:
-
-  S. Guérard, J. Gyselinck, and J. Lecomte-Beckers, "Finite element modelling of
-  an asynchronous motor with one broken rotor bar, comparison with the data
-  recorded on a prototype and material aspects", Bulletin Scientifique de l'AIM,
-  1:13-22, 2005.  Prix Melchior Salier 2004 du meilleur travail de fin d'études
-  section électromécanique-énergétique.  http://hdl.handle.net/2268/38463
-
-  Files:
-
-  im_data.geo
-  im.geo
-  im_rotor.geo
-  im_stator.geo
-  im.pro
-  im_circuit.pro
-
-* Switched reluctance machine
-
-  Used in:
-
-  J. Gyselinck, C. Geuzaine, and R. V. Sabariego. Considering laminated cores
-  and eddy currents in 2D and 3D finite element simulation of electrical
-  machines.  In Proceedings of the 18th Conference on the Computation of
-  Electromagnetic Fields (COMPUMAG2011), Sydney, Australia, July 12–15, 2011.
-
-  J. Gyselinck, C. Geuzaine, and R. V. Sabariego.  Homogenisation of windings
-  and laminations in time-domain finite-element modeling of electrical machines.
-  In Proceedings of the 15th Biennial IEEE Conference on Electromagnetic Field
-  Computation (CEFC2012), Oita, Japan, November 11– 14, 2012.
-
-  Files:
-
-  srm_data.geo
-  srm.geo
-  srm_rotor.geo
-  srm_stator.geo
-  srm.pro
-  srm_circuit.pro
-
diff --git a/ElectricMachines/infos.xml b/ElectricMachines/infos.xml
index c828f9f..9434fa9 100644
--- a/ElectricMachines/infos.xml
+++ b/ElectricMachines/infos.xml
@@ -6,27 +6,27 @@
 		<summary>Eight-pole surface mounted PMSM</summary>
 		<file type="geo">pmsm.geo</file>
 		<preview type="png">infos_pmsm.png</preview>
-		<url>http://onelab.info/wiki/Electric_machines</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Electric-machines</url>
 	</model>
 	<model>
 		<title>Wound field synchronous machine</title>
 		<summary>Four-pole WFSM</summary>
 		<file type="geo">wfsm_4p.geo</file>
 		<preview type="png">infos_wfsm_4p.png</preview>
-		<url>http://onelab.info/wiki/Electric_machines</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Electric-machines</url>
 	</model>
 	<model>
 		<title>Induction machine</title>
 		<summary>3kW Four-pole induction machine</summary>
 		<file type="pro">im_3kW.pro</file>
 		<preview type="png">infos_im_3kW.png</preview>
-		<url>http://onelab.info/wiki/Electric_machines</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Electric-machines</url>
 	</model>
 	<model>
 		<title>Switched reluctance machine</title>
 		<summary>Simple SRM</summary>
 		<file type="pro">srm.pro</file>
 		<preview type="png">infos_srm.png</preview>
-		<url>http://onelab.info/wiki/Electric_machines</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Electric-machines</url>
 	</model>
 </models>
diff --git a/ElectromechanicalRelay/infos.xml b/ElectromechanicalRelay/infos.xml
index f8bb712..1f201e6 100644
--- a/ElectromechanicalRelay/infos.xml
+++ b/ElectromechanicalRelay/infos.xml
@@ -6,6 +6,6 @@
 		<summary>2D model of an electro-mechanical relay</summary>
 		<file type="pro">relay.pro</file>
 		<preview type="png">screenshot_relay_128.png</preview>
-		<url>http://onelab.info/wiki/Electromechanical_relay</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Electromechanical-relay</url>
 	</model>
 </models>
diff --git a/Inductor/infos.xml b/Inductor/infos.xml
index 0928922..ab60052 100644
--- a/Inductor/infos.xml
+++ b/Inductor/infos.xml
@@ -6,6 +6,6 @@
 		<summary>2D and 3D model of an inductor/core system</summary>
 		<file type="pro">inductor.pro</file>
 		<preview type="png">screenshot_inductor_128.png</preview>
-		<url>http://onelab.info/wiki/Inductor</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Inductor</url>
 	</model>
 </models>
diff --git a/Magnetometer/infos.xml b/Magnetometer/infos.xml
index 20a4af3..1175b2c 100644
--- a/Magnetometer/infos.xml
+++ b/Magnetometer/infos.xml
@@ -6,6 +6,6 @@
 		<summary>3D model of a xylophone-bar magnetometer</summary>
 		<file type="pro">magnetometer.pro</file>
 		<preview type="png">infos.png</preview>
-		<url>http://onelab.info/wiki/Magnetometer</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Magnetometer</url>
 	</model>
 </models>
diff --git a/Magnets/infos.xml b/Magnets/infos.xml
index a15ec0d..154925f 100644
--- a/Magnets/infos.xml
+++ b/Magnets/infos.xml
@@ -6,6 +6,6 @@
 		<summary>3D force computation of a collection of magnets</summary>
 		<file type="pro">magnets.pro</file>
 		<preview type="png">screenshot_magnets_128.png</preview>
-		<url>http://onelab.info/wiki/Magnets</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Magnets</url>
 	</model>
 </models>
diff --git a/Superconductors/infos.xml b/Superconductors/infos.xml
index 39e9ab8..0990090 100644
--- a/Superconductors/infos.xml
+++ b/Superconductors/infos.xml
@@ -6,6 +6,6 @@
 		<summary>2D and 3D H-formulation of HTS with nonlinear power law</summary>
 		<file type="pro">helix.pro</file>
 		<preview type="png">screenshot_helix_128.png</preview>
-		<url>http://onelab.info/wiki/Superconducting_wire</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Superconductors</url>
 	</model>
 </models>
diff --git a/ThermalConduction/infos.xml b/ThermalConduction/infos.xml
index c5d252d..69f1ce8 100644
--- a/ThermalConduction/infos.xml
+++ b/ThermalConduction/infos.xml
@@ -6,6 +6,6 @@
 		<summary>Heat conduction after a transient heat flux pulse</summary>
 		<file type="pro">contact.pro</file>
 		<preview type="png">infos.png</preview>
-		<url>http://onelab.info/wiki/Thermal_conduction</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Thermal-conduction</url>
 	</model>
 </models>
diff --git a/Waveguides/infos.xml b/Waveguides/infos.xml
index 9c24591..3dc8c19 100644
--- a/Waveguides/infos.xml
+++ b/Waveguides/infos.xml
@@ -6,27 +6,27 @@
 		<summary>2D model of a rectangular metallic waveguide</summary>
 		<file type="pro">waveguide2D_straight.pro</file>
 		<preview type="png">infos_straight.png</preview>
-		<url>http://onelab.info/wiki/Waveguides</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Waveguides</url>
 	</model>
 	<model>
 		<title>H-bend waveguide</title>
 		<summary>2D model of a bended metallic waveguide</summary>
 		<file type="pro">waveguide2D_Hbend.pro</file>
 		<preview type="png">infos_Hbend.png</preview>
-		<url>http://onelab.info/wiki/Waveguides</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Waveguides</url>
 	</model>
 	<model>
 		<title>Star-shaped waveguide</title>
 		<summary>2D model of a star-shaped metallic waveguide</summary>
 		<file type="pro">waveguide2D_starNetwork.pro</file>
 		<preview type="png">infos_starNetwork.png</preview>
-		<url>http://onelab.info/wiki/Waveguides</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Waveguides</url>
 	</model>
 	<model>
 		<title>Multi-mode interference coupler</title>
 		<summary>2D model of an MMI</summary>
 		<file type="pro">waveguide2D_MMI.pro</file>
 		<preview type="png">infos_MMI.png</preview>
-		<url>http://onelab.info/wiki/Waveguides</url>
+		<url>https://gitlab.onelab.info/doc/models/wikis/Waveguides</url>
 	</model>
 </models>
-- 
GitLab