Changeset 2309 for palm/trunk/SCRIPTS/palm_gf

Timestamp:

Jul 10, 2017 3:55:55 PM (7 years ago)

Author:

gronemeier

Message:

some further bugfixes for palm_gf

File:

• palm/trunk/SCRIPTS/palm_gf (modified) (3 diffs)

palm/trunk/SCRIPTS/palm_gf

@@ -422 +422 @@
         c.execute("DROP TABLE IF EXISTS grid_limits")
         c.execute(
-            "CREATE TABLE IF NOT EXISTS grid_current(nx INT, ny INT, nz INT, npex INT, npey INT, npxnpy FLOAT, np INT, ngpts INT)")
+            "CREATE TABLE IF NOT EXISTS grid_current(nx INT, ny INT, nz INT, npex INT, npey INT, npxnpy FLOAT, np INT, ngpts INT, nxnpex FLOAT, nynpey FLOAT)")
         c.execute(
-            "CREATE TABLE IF NOT EXISTS grid_limits(nx INT, ny INT, nz INT, npex INT, npey INT, npxnpy FLOAT, np INT, ngpts INT)")
+            "CREATE TABLE IF NOT EXISTS grid_limits(nx INT, ny INT, nz INT, npex INT, npey INT, npxnpy FLOAT, np INT, ngpts INT, nxnpex FLOAT, nynpey FLOAT)")
         conn.commit()
         main_bool = True
@@ -591 +591 @@
 
                                 npxnpy = format(float(npex) / float(npey), '.2f')
+                                nxpex = float(nx+1) /float(npex)
+                                nypey = float(ny+1) /float(npey)
+
                                 c.execute(
-                                    """INSERT OR REPLACE INTO grid_current(nx, ny, nz, npex, npey, npxnpy, np, ngpts) VALUES (?, ?, ?, ?, ?, ?, ?, ?)""",
-                                    (nx, ny, nz, npex, npey, npxnpy, (npex * npey), (nx * ny * nz)))
+                                    """INSERT OR REPLACE INTO grid_current(nx, ny, nz, npex, npey, npxnpy, np, ngpts, nxnpex, nynpey) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
+                                    (nx, ny, nz, npex, npey, npxnpy, (npex * npey), (nx * ny * nz), nxpex, nypey))
 
                                 nz += 1
@@ -669 +672 @@
             mn_ngpts = c.fetchone()[0]
             # print(mn_ngpts)
+            c.execute("SELECT nxnpex FROM grid_current ORDER BY nxnpex DESC LIMIT 1")
+            mx_nxpex = c.fetchone()[0]
+            c.execute("SELECT nxnpex FROM grid_current ORDER BY nxnpex LIMIT 1")
+            mn_nxpex = c.fetchone()[0]
+            c.execute("SELECT nynpey FROM grid_current ORDER BY nynpey DESC LIMIT 1")
+            mx_nypey = c.fetchone()[0]
+            c.execute("SELECT nynpey FROM grid_current ORDER BY nynpey LIMIT 1")
+            mn_nypey = c.fetchone()[0]
+
+
 
             conn.commit()
             c.execute(
-                """INSERT OR REPLACE INTO grid_limits(nx, ny, nz, npex, npey, npxnpy, np, ngpts) VALUES (?, ?, ?, ?, ?, ?, ?, ?)""",
-                (mn_nx, mn_ny, mn_nz, mn_npex, mn_npey, mn_npxnpy, mn_np, mn_ngpts))
+                """INSERT OR REPLACE INTO grid_limits(nx, ny, nz, npex, npey, npxnpy, np, ngpts, nxnpex, nynpey) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
+                (mn_nx, mn_ny, mn_nz, mn_npex, mn_npey, mn_npxnpy, mn_np, mn_ngpts, mn_nxpex, mn_nypey))
 
             c.execute(
-                """INSERT OR REPLACE INTO grid_limits(nx, ny, nz, npex, npey, npxnpy, np, ngpts) VALUES (?, ?, ?, ?, ?, ?, ?, ?)""",
-                (mx_nx, mx_ny, mx_nz, mx_npex, mx_npey, mx_npxnpy, mx_np, mx_ngpts))
+                """INSERT OR REPLACE INTO grid_limits(nx, ny, nz, npex, npey, npxnpy, np, ngpts, nxnpex, nynpey) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
+                (mx_nx, mx_ny, mx_nz, mx_npex, mx_npey, mx_npxnpy, mx_np, mx_ngpts, mx_nxpex, mx_nypey))
             conn.commit()