From 20a439d7726bf5503ac860494b9e93f4dafd8b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Clau=C3=9F?= <markus@linsenbruch.de>
Date: Tue, 27 Jun 2023 11:08:25 +0200
Subject: [PATCH] switch to keycload, add regression for citt

---
 src/paveit/datamodels/citt.py           |  1 -
 src/paveit/datamodels/enumeration.py    |  3 +--
 src/paveit/datamodels/usermanagement.py |  3 ++-
 src/paveit/helper/mongo.py              |  1 -
 src/paveit/labtest/citt.py              | 10 ++++------
 src/paveit/postprocessing/citt.py       |  8 +++++---
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/paveit/datamodels/citt.py b/src/paveit/datamodels/citt.py
index 01da2e5..e198cbf 100755
--- a/src/paveit/datamodels/citt.py
+++ b/src/paveit/datamodels/citt.py
@@ -60,7 +60,6 @@ class CITTSiffnessResults(CyclicIndirectTensileTest):
     nu = FloatField()
     phase = FloatField()
     el_strains = FloatField()
-    sigma_calc = FloatField()
     #required parameter
     ## F
     F_amp = FloatField()
diff --git a/src/paveit/datamodels/enumeration.py b/src/paveit/datamodels/enumeration.py
index 38c2028..31685da 100755
--- a/src/paveit/datamodels/enumeration.py
+++ b/src/paveit/datamodels/enumeration.py
@@ -2,8 +2,8 @@ import datetime
 from enum import Enum
 
 from mongoengine import *
-from paveit.helper import fetch_recursive, mongo_to_dict
 
+from paveit.helper import fetch_recursive, mongo_to_dict
 
 from .usermanagement import Organisation
 
@@ -65,7 +65,6 @@ class Config(Document):
         # convert data to dict
         data = fetch_recursive(self)
         data = mongo_to_dict(data)
-        print(data)
         
         if enabled:
             if data['enabled']:
diff --git a/src/paveit/datamodels/usermanagement.py b/src/paveit/datamodels/usermanagement.py
index 01322d2..929f0ab 100755
--- a/src/paveit/datamodels/usermanagement.py
+++ b/src/paveit/datamodels/usermanagement.py
@@ -32,6 +32,8 @@ class Organisation(Document):
 
 class User(Document):
 
+    _id = UUIDField(binary=True, primary_key=True)
+    
     org_id = LazyReferenceField(Organisation,
                                 required=True,
                                 reverse_delete_rule=CASCADE)
@@ -41,7 +43,6 @@ class User(Document):
                                    "step": "60"
                                }})
 
-    email = EmailField(required=True)
 
     meta = {
         'allow_inheritance': True,
diff --git a/src/paveit/helper/mongo.py b/src/paveit/helper/mongo.py
index 7605725..8412a4f 100755
--- a/src/paveit/helper/mongo.py
+++ b/src/paveit/helper/mongo.py
@@ -35,7 +35,6 @@ def mongo_upload_results(resultsmodel, results: DataFrame, datamodel,
 
         #check if result in db
         #n = CITTSiffness.objects(**meta).count()
-        #print(n)
 
         # write data
         data_dict = res.to_dict()
diff --git a/src/paveit/labtest/citt.py b/src/paveit/labtest/citt.py
index 7671d65..6d6c3d0 100755
--- a/src/paveit/labtest/citt.py
+++ b/src/paveit/labtest/citt.py
@@ -242,17 +242,15 @@ class CITTBase(DataSineLoad):
                 
                 nu = calc_nu(temperature)
                 res_temp['nu'] = nu
+                
+                print(deltaF, deltaU, h, d, nu, np.pi)
 
                 #nach TP Asphalt 26
-                res_temp['stiffness'] = deltaF /(h * deltaU)  (4.0/np.pi -1 + nu)
+                res_temp['stiffness'] = deltaF /(h * deltaU) * (4.0/np.pi -1 + nu)
                 
                 ## Elastische hori. Dehnung                
-                res_temp['el_strains'] = 2*deltaU/d * (1+3*nu)/(4 + np.pi*nu - np.pi) * 1000.0
+                res_temp['el_strains'] = 2*2*deltaU/d * (1+3*nu)/(4 + np.pi*nu - np.pi) * 1000.0 # 2*2 daher, da deltaU nur Ampl. nicht Gesamtkraft ist
                 
-                ## maximale Zugspannung im Probekörpermittelpunkt
-                res_temp['sigma_calc'] = (2*deltaF)/(np.pi*d*h)
-                
-
                 # TODO: Überarbeiten und erweitern (ISSUE #2)
                 res_temp['phase'] = res_temp['fit_F_phase'] - res_temp['fit_s_hor_sum_phase']
                 
diff --git a/src/paveit/postprocessing/citt.py b/src/paveit/postprocessing/citt.py
index 555e38f..828d21a 100644
--- a/src/paveit/postprocessing/citt.py
+++ b/src/paveit/postprocessing/citt.py
@@ -1,13 +1,15 @@
 import datetime
 
-import numpy as np
-from bson import ObjectId
-from paveit.datamodels import CITTSiffnessResults, RegCITT
 import lmfit as lm
+import numpy as np
 import pandas as pd
 import scipy.special as sf
+from bson import ObjectId
 from scipy.optimize import curve_fit
 
+from paveit.datamodels import CITTSiffnessResults, RegCITT
+
+
 def temp_freq_equivalence(T, f, phi, T0=20.0):
     
     alphaT = np.exp(phi * ((1 / (T + 273.15)) - (1 / (T0 + 273.15))))