Merge remote-tracking branch 'origin/master' into boman

cfg/clifton/lagamine.profile

+add2env LD_LIBRARY_PATH "/opt/lagamine/lib"
+add2env INCLUDE "/opt/lagamine/include"
+add2env LIB "/opt/lagamine/lib"

cfg/fabulous/modules.profile

@@ -5,7 +5,8 @@ module load gcc/9.3.0 cmake swig
 module load python/3.7.7 openssl 
 module load qt vtk/7.1.1-Py3 parasolid mumps/mkl-tbb/4.10.0-gcc9.3
 
-module load lagamineAPI/200610-gcc9.3
+module load lagamineAPI
+#module load lagamineAPI/200824-gcc9.3
 
 module load samcef gmsh-sdk/4.5.6 
 module load isosurf tetgen triangle

cfg/spring/eigen.profile

-add2env INCLUDE "/opt/eigen/"

cfg/spring/gmm.profile

-add2env INCLUDE "/opt/gmm/include"

cfg/thorgal/eigen.profile

-add2env INCLUDE "/opt/eigen/"

cfg/thorgal/gmm.profile

-add2env INCLUDE "/opt/gmm/include"

parametricJob.py

@@ -68,8 +68,9 @@ class ParametricJob(PRMSet):
             except:
                 text="file not found"
         import smtplib
-        server = smtplib.SMTP(smtpServ)
-        server.sendmail(fromA, toA, head+text)
+        server = smtplib.SMTP(smtpServ)        
+        server.sendmail(fromA, toA, (head+text).encode('ascii','ignore'))
+        #server.sendmail(fromA, toA, head+text)
         server.quit()
 
     def mailhtml(self, file, subject):
@@ -77,7 +78,8 @@ class ParametricJob(PRMSet):
         # getting address & smtp servers
         fromA, toA, smtpServ = self.getMailData()
         # building email
-        from email.MIMEText import MIMEText
+        #from email.MIMEText import MIMEText
+        from email.mime.text import MIMEText
         file = open(file,'r')
         text = file.read()
         file.close()
@@ -108,7 +110,8 @@ class ParametricJob(PRMSet):
         mail['Subject'] = subject
         #mail.preamble   = 'Battery result in attachement \n'
         machineName = socket.gethostname()
-        from email.MIMEText import MIMEText
+        #from email.MIMEText import MIMEText
+        from email.mime.text import MIMEText
         text = "Battery result on %s in attachement ...\n" % machineName
         msg  = MIMEText(text, 'html','iso-8859-1')
         msg['From']    = fromA