Changes between Version 5 and Version 6 of fortran

Timestamp:

Oct 18, 2016, 9:01:47 AM (8 years ago)

Author:

ivasileska

Comment:

--

fortran

@@ -2 +2 @@
 = FORTRAN 95 examples =
 
-== Console1.f90 ==
+== Integral function calculation using trapeze, rectangle and Simson method ==
 {{{
 #!fortran
@@ -15 +15 @@
 S3=0
 do i=0,n
-       S1=S1+(f(i*dx+a)+f((i+1)*dx+a))/2*dx
-       S2=S2+ f(i*dx+a)*dx 
+       S1=S1+(f(i*dx+a)+f((i+1)*dx+a))/2*dx !integral which is calculate by trapeze method
+       S2=S2+ f(i*dx+a)*dx !integral which is calculate with rectangle method
 if(mod(i,2)==0) then 
-       S3=S3+dx/3*2*f(i*dx+a)
+       S3=S3+dx/3*2*f(i*dx+a) !integral which is calculate by Simson method
    else 
        S3=S3+dx/3*4*f(i*dx+a)
@@ -30 +30 @@
 
 function f(x) 
-f=1/sqrt(1-x**2)
+f=1/sqrt(1-x**2) !integral function
 end function f
 end
 }}}
 
-== Console2.f90 ==
+==  ==
 {{{
 #!fortran
@@ -90 +90 @@
 do i=1,n
     write(1,*) i*dx + a, sin(i*dx+a)*sin(2*i*dx+a)*sin(3*i*dx+a)
-end do
+end domethod of 
 end
 }}}
@@ -129 +129 @@
 
  end function
-print *, s
+print *, smethod of 
 end program
 }}}
@@ -2945 +2945 @@
    17 AUX(4,I)=Y(I)                                                     
       ITEST=1                                                           
-      ISTEP=ISTEP+ISTEP-2                                               
+      ISTEP=ISTEP+ISTEP-2                          Console2.f90                     
    18 IHLF=IHLF+1
       X=X-H