complete

fortran/boundary.f90

@@ -131,15 +131,26 @@ subroutine apply_boundary_conditions (u, v, flag, t)
     u(0, 1:jmax) = ui
     v(0, 1:jmax) = 2*vi-v(1,1:jmax)
 
-    ! silly tricks to drop pieces of high flow in at certain points during the sim - fun for
-    if (mod(t, 4.0) < 0.4 .and. t > 0.5) then
-       do i = -1, 1, 1
-          do j = -1, 1, 1
-             u(mod(floor(t*10.0+i),imax),mod(floor(t*5+j),jmax)) = 1
-             v(mod(floor(t*10.0+i),imax),mod(floor(t*5+j),jmax)) = 1
-          end do
-       end do
-    end if
+    ! code for a conflicting flow coming in from the opposite side
+    !if (t < 45) then
+    !  u(imax, 1:jmax) = -ui
+    !  u(imax-1, 1:jmax) = -ui
+    !  u(imax+1, 1:jmax) = -ui
+    !else
+    !  u(imax,0:jmax+1) = u(imax-1,0:jmax+1)
+    !end if
+
+
+    ! silly tricks to drop pieces of high flow in at certain points during the sim - for fun
+    !if (mod(t, 4.0) < 0.4 .and. t > 0.5) then
+    !   do i = -1, 1, 1
+    !      do j = -1, 1, 1
+    !         u(mod(floor(t*10.0+i),imax),mod(floor(t*5+j),jmax)) = 1
+    !         v(mod(floor(t*10.0+i),imax),mod(floor(t*5+j),jmax)) = 1
+    !      end do
+    !   end do
+    !end if
+
    end subroutine
 
 

fortran/build-vid

@@ -0,0 +1,14 @@
+#!/bin/bash
+cd $1
+for f in *.ppm
+do
+   if [ ! -e "`basename $f ppm`jpg" ]
+   then
+     echo Converting $f
+     convert -quality 100 $f `basename $f ppm`jpg
+   fi
+done 
+ffmpeg -f image2 -i %06d.jpg -b 800k $1.mpeg
+mv $1.mpeg ../.
+cd ../.
+

fortran/helpers.f90

@@ -15,7 +15,7 @@ module helpers
   real, parameter :: Re = 150.0, ui = 1.0, vi = 0.0
 
   integer, parameter :: imax = 660, jmax = 120, outputFlag = 1, output_freq = 10, itermax = 10
-  real, parameter :: output_freqt = 0.04
+  real, parameter :: output_freqt = 0.05
   real, parameter :: xlength = 22.0, ylength = 4.1
   real, parameter :: delx = xlength/imax, dely = ylength/jmax
 

fortran/init.f90

@@ -29,17 +29,18 @@ subroutine initFlag(delx, dely, flag, ibound)
                flag(i,j) = C_B 
             end if
 
-            x1 = (i-0.5)*delx - mx*4
-            y1 = (j-0.5)*dely - my*1.25
-            if (x1*x1 + y1*y1 <= rad1*rad1) then 
-               flag(i,j) = C_B 
-            end if
-
-            x1 = (i-0.5)*delx - mx*3
-            y1 = (j-0.5)*dely - my*0.5
-            if (x1*x1 + y1*y1 <= rad1*rad1) then 
-               flag(i,j) = C_B 
-            end if
+            ! Some code for adding a few more circular masks near-by
+            !x1 = (i-0.5)*delx - mx*4
+            !y1 = (j-0.5)*dely - my*1.25
+            !if (x1*x1 + y1*y1 <= rad1*rad1) then 
+            !   flag(i,j) = C_B 
+            !end if
+            !
+            !x1 = (i-0.5)*delx - mx*3
+            !y1 = (j-0.5)*dely - my*0.5
+            !if (x1*x1 + y1*y1 <= rad1*rad1) then 
+            !   flag(i,j) = C_B 
+            !end if
 
          end do
       end do

fortran/main.f90

@@ -15,10 +15,6 @@ program navier
 
    implicit none
 
-   type::data_t
-      integer::d
-   end type
-
    character(10) :: outname = "output"
 
    real :: t = 0, res = 0, del_t = 0.003, t_count = 0.0
@@ -29,11 +25,6 @@ program navier
    real rhs(0:imax+1, 0:jmax+1), f(0:imax+1, 0:jmax+1), g(0:imax+1, 0:jmax+1)
    integer flag(0:imax+1, 0:jmax+1)
 
-   !do i = 0, imax+1, 1
-   !   do j = 0, jmax+1, 1
-   !      u
-   !   end do
-   !end do
    u = ui
    v = vi
    p = 0.0
@@ -68,15 +59,18 @@ program navier
 
       call apply_boundary_conditions(u, v, flag, t)
 
-      if (toLogical(outputFlag) .and. (t >= t_count)) then
-          call write_ppm(u, v, p, flag, output_counter, outname)
-          output_counter = output_counter + 1
-          t_count = t_count + output_freqt
-      end if
-
-      !if (toLogical(outputFlag) .and. (mod(iters, output_freq) == 0)) then
-      !   call write_ppm(u, v, p, flag, iters, outname)
+      ! An alternate way to print output using the simulation time
+      !if (toLogical(outputFlag) .and. (t >= t_count)) then
+      !    call write_ppm(u, v, p, flag, output_counter, outname)
+      !    output_counter = output_counter + 1
+      !    t_count = t_count + output_freqt
       !end if
+
+      if (toLogical(outputFlag) .and. (mod(iters, output_freq) == 0)) then
+         call write_ppm(u, v, p, flag, iters, outname)
+         output_counter = output_counter + 1
+         t_count = t_count + output_freqt
+      end if
 
       t = t + del_t
       iters = iters + 1

fortran/output.f90

@@ -47,6 +47,17 @@ subroutine write_ppm (u, v, p, flag, iters, outname)
                r = (abs(zval/12.6)**0.4) * 255
                g = r
                b = r
+               if (r > 255) then
+                  if (r < 510) then
+                     g = 255 - (r - 255)
+                     b = 255 - (r - 255)
+                     r = 255
+                  else
+                     b = 255 - (r - 510)
+                     g = 255
+                     r = 255
+                  end if
+               end if
             end if
             write(8,"(A1,A1,A1,$)") char(r), char(g), char(b)
          end do

fortran/simulation.f90

@@ -15,7 +15,7 @@ subroutine compute_tentative_velocity(u, v, f, g, flag, del_t)
       do i = 1, (imax-1)
         do j = 1, jmax
             ! only if both adjacent cells are fluid cells */
-            if (toLogical(iand(flag(i,j), C_F)) .and. toLogical(iand(flag(i,j), C_F))) then
+            if (toLogical(iand(flag(i,j), C_F)) .and. toLogical(iand(flag(i+1,j), C_F))) then
 
                 du2dx = ((u(i,j)+u(i+1,j))*(u(i,j)+u(i+1,j))+ & 
 			   gamma*abs(u(i,j)+u(i+1,j))*(u(i,j)-u(i+1,j))- &
@@ -40,7 +40,7 @@ subroutine compute_tentative_velocity(u, v, f, g, flag, del_t)
     do i = 1, imax
        do j = 1, (jmax-1)
           ! only if both adjacent cells are fluid cells
-          if (toLogical(iand(flag(i,j), C_F)) .and. toLogical(iand(flag(i,j), C_F))) then
+          if (toLogical(iand(flag(i,j), C_F)) .and. toLogical(iand(flag(i,j+1), C_F))) then
 
              duvdx = ((u(i,j)+u(i,j+1))*(v(i,j)+v(i+1,j))+  &
                       gamma*abs(u(i,j)+u(i,j+1))*(v(i,j)-v(i+1,j))- &