12 changed files with 48 additions and 61 deletions
--- a/assets/MonumentoBandera.stl
+++ b/assets/MonumentoBandera.stl
--- a/assets/aspas_126m_85.stl
+++ b/assets/aspas_126m_85.stl
--- a/casa_80.stl
+++ b/casa_80.stl
--- a/assets/cuerpo_126m_50.stl
+++ b/assets/cuerpo_126m_50.stl
--- a/index.html
+++ b/index.html
@ -1,8 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/strict.dtd">
-<html xmlns="http://www.w3.org/TR/xhtml1/strict" >
- <head>
-  <title>Simulador de Aerogeneradores y Parques Eólicos (SAPE), CSC-CONICET</title>
 <script type="importmap">
  {
    "imports": {
@ -21,21 +16,20 @@ function hide() {
    document.getElementById("popup").style.display = "none";
 }
 </script>
- </head>
 <body>
 <div id="container">
        <div id="popup">
            <div id="close" onclick="hide();">✗</div>
            <div id="text">
-     <img src="assets/logooscuro.png" style="width: 30vh;" /><br />
+		    <img src="logooscuro.png" style="width: 30vh;" /><br />
 		    <p>Simulador de Aerogeneradores y Parques Eólicos (SAPE)</p>
 		    <p>Centro de Simulación Computacional para Aplicaciones Tecnológicas - CONICET</p>
 	    </div>
        </div>
        <div id="button" onclick="ws.simulate();">¡SIMULAR!</div>
        <div id="copyright">&copy;2024 Centro de Simulación Computacional para Aplicaciones Tecnológicas (CSC) - CONICET</div>
-   <div id="rotate"><img src="assets/rotar_telefono.png" /><p>Rotá tu<br />dispositivo</p></div>
+	<div id="rotate"><img src="rotar_telefono.png" /><p>Rotá tu<br />dispositivo</p></div>
 	<div id="logo"><a href="http://www.csc.gob.ar"><img src="logooscuro.png" /></a></div>
 </div>
+
 </body>
-</html>
--- a/js/main.js
+++ b/js/main.js
@ -37,7 +37,7 @@ class WindSimulation {
        scene.add(this.checkBoard);

        const loader = new STLLoader();
-        loader.load('assets/MonumentoBandera.stl', (geometry) => {
+        loader.load('./MonumentoBandera.stl', (geometry) => {
            var material = new THREE.MeshBasicMaterial({color: 0xffffff});
            var mesh = new THREE.Mesh(geometry, material);
            var scale = 0.0093;
@ -175,7 +175,7 @@ var width = 10;
 var height = 10;
 var ws = new WindSimulation(width, height, 5);

-var screen = new Screen(camera, renderer, new THREE.Vector3(width / 2 + 0.5, height / 2, -0.65));
+var screen = new Screen(camera, renderer, new THREE.Vector3(width / 2 + 0.5, height / 2, -0.95));
 screen.setMoveCallBack((pos, end) => { ws.move(pos, end); });
 screen.onResize();

--- a/js/screen.js
+++ b/js/screen.js
@ -14,11 +14,11 @@ class Screen {
        this.pointerScreen = new THREE.Vector2();
        this.pointerWorld = new THREE.Vector3();

-        this.radius = 24;
+        this.radius = 23;
        this.phi = -0.5;
        this.theta = 0.45;
        this.z = 15;
-        this.aspect = 2.13;
+        this.aspect = 2.24;

        this.clicked = false;

--- a/js/windmill.js
+++ b/js/windmill.js
@ -9,10 +9,10 @@ class WindMill extends THREE.Group {

    static {
        const loader = new STLLoader();
-        loader.load('assets/aspas_126m_85.stl', function(geometry) {
+        loader.load('./aspas_126m_85.stl', function(geometry) {
            WindMill.geometryBlades = geometry;
        });
-        loader.load('assets/cuerpo_126m_50.stl', function(geometry) {
+        loader.load('./cuerpo_126m_50.stl', function(geometry) {
            WindMill.geometryBody = geometry;
        });
    }
@ -39,7 +39,7 @@ class WindMill extends THREE.Group {

        var geometry = new THREE.CircleGeometry(0.5, 20);
        this.meshCircle = new THREE.Mesh(geometry, this.materialCircle);
-        this.meshCircle.position.z = 0.001;
+        this.meshCircle.position.z = 0.01;
        this.meshCircle.visible = false;

        this.add(this.meshBlades);
--- a/assets/logooscuro.png
+++ b/assets/logooscuro.png
--- a/assets/rotar_telefono.png
+++ b/assets/rotar_telefono.png
--- a/server.py
+++ b/server.py
@ -1,4 +1,5 @@
-from flask import Flask, request, abort
+from flask import Flask
+from flask import request
 import json

 app = Flask(__name__)
@ -7,8 +8,8 @@ import xxx

@app.route("/", methods=['GET', 'POST'])
 def index():
-    if request.method != 'POST' or not request.data:
-        return abort(400);
+    if request.method == 'POST':
+        if request.data:
            params = json.loads(request.data.decode(encoding='utf-8'))
            pos = params['pos'];
            ws = xxx.run(pos);
@ -18,4 +19,4 @@ def index():
            }

 if __name__ == "__main__":
-        app.run(host='localhost', port='1234')
+        app.run(host='0.0.0.0', port='1234')
--- a/xxx.py
+++ b/xxx.py
@ -1,13 +1,11 @@
 from py_wake.wind_turbines import WindTurbine
 from py_wake.wind_turbines.power_ct_functions import PowerCtTabular
 from py_wake.site._site import UniformSite
-from py_wake.site.xrsite import XRSite
 from py_wake.wind_farm_models import PropagateDownwind
 from py_wake.deficit_models.gaussian import TurboGaussianDeficit
 from py_wake.flow_map import XYGrid

 import numpy as np
-import xarray as xr

 D = 126      #Diametro del wT
 h = 90       #Altura del WT
@ -73,15 +71,9 @@ windTurbines = py_wake_Initial_Cong(D, 'NREL_5MW', h, U_ref)

 def run(initial_position=initial_position, U_ref=U_ref):
    initial_position = np.array(initial_position);
-    #site = UniformSite(p_wd=[1],
-    #                        ws=U_ref,
-    #                        initial_position=initial_position*D)
-    ds = xr.Dataset(
-        data_vars={'P': ('wd', [1])},
-        coords={'wd': [0]})
-    ds['TI'] = 0.1
-    site = XRSite(ds, interp_method='nearest', initial_position=initial_position*D, default_ws=np.atleast_1d(U_ref))
-
+    site = UniformSite(p_wd=[1],
+                            ws=U_ref,
+                            initial_position=initial_position*D)
    wt_x, wt_y = site.initial_position.T/D
    wfm = PropagateDownwind(site, windTurbines, wake_deficitModel=TurboGaussianDeficit())
    grid = XYGrid(x=np.arange(0, 10.01, 0.1)*126, y=np.arange(0, 10.01, 0.1)*126)