Commit b7630082 authored by kbk's avatar kbk
Browse files

added support for Intel/IFORT compiler - expanded TABS, same types in subroutine calls

parent bb070be6
......@@ -19,7 +19,7 @@
REALTYPE,dimension(:,:),allocatable :: zub0,zvb0
REALTYPE,dimension(:,:),allocatable :: surfdiv
REALTYPE,dimension(:), allocatable :: EWbdy,ENbdy,EEbdy,ESbdy
REALTYPE,dimension(:), allocatable:: EWbdy,ENbdy,EEbdy,ESbdy
! Remember to update this value if you add more 2D arrays.
integer, parameter :: n2d_fields=35
!$Id: update_2d_bdy.F90,v 1.3 2003-04-23 12:09:44 kbk Exp $
!$Id: update_2d_bdy.F90,v 1.4 2003-12-16 16:50:40 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -12,7 +12,7 @@
!
! !USES:
use domain, only: NWB,NNB,NEB,NSB,H,min_depth,imin,imax,jmin,jmax,az
use domain, only: wi,wfj,wlj,nj,nfi,nli,ei,efj,elj,sj,sfi,sli,nsbv
use domain, only: wi,wfj,wlj,nj,nfi,nli,ei,efj,elj,sj,sfi,sli
use domain, only: bdy_index,nsbv
use m2d, only: dtm,bdyfmt_2d,bdy_data
use variables_2d, only: z
......@@ -29,7 +29,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: update_2d_bdy.F90,v $
! Revision 1.3 2003-04-23 12:09:44 kbk
! Revision 1.4 2003-12-16 16:50:40 kbk
! added support for Intel/IFORT compiler - expanded TABS, same types in subroutine calls
!
! Revision 1.3 2003/04/23 12:09:44 kbk
! cleaned code + TABS to spaces
!
! Revision 1.2 2003/04/07 15:45:05 kbk
......@@ -72,6 +75,7 @@
REALTYPE, save :: t,t1,t2
REALTYPE :: a,amp,ratio,fac
integer :: i,j,k,l,n
REALTYPE, parameter :: FOUR=4.*_ONE_
!
!EOP
!-----------------------------------------------------------------------
......@@ -172,7 +176,7 @@
ratio = _ONE_
fac = _ONE_
if(bdyramp .gt. 1) fac=min( _ONE_ ,4.*loop/float(bdyramp))
if(bdyramp .gt. 1) fac=min( _ONE_ ,FOUR*loop/float(bdyramp))
l = 0
do n = 1,NWB
......
......@@ -49,7 +49,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: advection_3d.F90,v $
! Revision 1.4 2003-09-03 05:38:45 kbk
! Revision 1.5 2003-12-16 16:50:40 kbk
! added support for Intel/IFORT compiler - expanded TABS, same types in subroutine calls
!
! Revision 1.4 2003/09/03 05:38:45 kbk
! need to call update_3d_halo() for each directional split
!
! Revision 1.3 2003/04/23 12:16:34 kbk
......@@ -118,6 +121,7 @@
!
! !LOCAL VARIABLES:
integer :: advection_method
REALTYPE, parameter :: ONE=_ONE_,TWO=2.*_ONE_
!EOP
!-----------------------------------------------------------------------
......@@ -216,7 +220,7 @@
! See the log for the module
!
! !LOCAL VARIABLES:
REALTYPE, parameter :: a1=0.5,a2=1.0
REALTYPE, parameter :: a1=0.5*ONE,a2=ONE
!
!EOP
!-----------------------------------------------------------------------
......@@ -539,7 +543,7 @@
end if
select case (method)
case ((P2),(P2_PDM))
x = one6th*(1.-2.0*c)
x = one6th*(ONE-TWO*c)
Phi=(0.5+x)+(0.5-x)*r
if (method.eq.P2) then
limit=Phi
......@@ -548,9 +552,9 @@
2.*r/(c+1.e-10)))
end if
case (Superbee)
limit=max(_ZERO_,min(1.0, 2.0*r),min(r,2.0))
limit=max(_ZERO_,min(ONE,TWO*r),min(r,TWO))
case (MUSCL)
limit=max(_ZERO_,min(2.0,2.0*r,0.5*(1.0+r)))
limit=max(_ZERO_,min(TWO,TWO*r,0.5*(ONE+r)))
case default
FATAL 'Not so good - do_advection_3d()'
stop 'u_split_adv'
......@@ -690,11 +694,11 @@
r=(fu-fc)*1.e10
end if
end if
x = one6th*(1.-2.0*c)
x = one6th*(ONE-TWO*c)
Phi=(0.5+x)+(0.5-x)*r
select case (method)
case ((P2),(P2_PDM))
x = one6th*(1.-2.0*c)
x = one6th*(ONE-TWO*c)
Phi=(0.5+x)+(0.5-x)*r
if (method.eq.P2) then
limit=Phi
......@@ -702,9 +706,9 @@
limit=max(_ZERO_,min(Phi,2./(1.-c),2.*r/(c+1.e-10)))
end if
case (Superbee)
limit=max(_ZERO_, min(1.0, 2.0*r), min(r,2.0) )
limit=max(_ZERO_, min(ONE,TWO*r), min(r,TWO) )
case (MUSCL)
limit=max(_ZERO_,min(2.0,2.0*r,0.5*(1.0+r)))
limit=max(_ZERO_,min(TWO,TWO*r,0.5*(ONE+r)))
case default
FATAL 'This is not so good - do_advection_3d()'
stop 'v_split_adv'
......@@ -837,11 +841,11 @@
r=(fu-fc)*1.e10
end if
end if
x = one6th*(1.-2.0*c)
x = one6th*(ONE-TWO*c)
Phi=(0.5+x)+(0.5-x)*r
select case (method)
case ((P2),(P2_PDM))
x = one6th*(1.-2.0*c)
x = one6th*(ONE-TWO*c)
Phi=(0.5+x)+(0.5-x)*r
if (method.eq.P2) then
limit=Phi
......@@ -849,9 +853,9 @@
limit=max(_ZERO_,min(Phi,2./(1.-c),2.*r/(c+1.e-10)))
end if
case (Superbee)
limit=max(_ZERO_, min(1.0, 2.0*r), min(r,2.0) )
limit=max(_ZERO_, min(ONE, TWO*r), min(r,TWO) )
case (MUSCL)
limit=max(_ZERO_,min(2.0,2.0*r,0.5*(1.0+r)))
limit=max(_ZERO_,min(TWO,TWO*r,0.5*(ONE+r)))
case default
FATAL 'This is not so good - do_advection_3d()'
stop 'w_split_adv'
......@@ -991,11 +995,11 @@
r= (fu-fc)*1.e10
end if
end if
x = one6th*(1.-2.0*c)
x = one6th*(ONE-TWO*c)
Phi=(0.5+x)+(0.5-x)*r
select case (method)
case ((P2),(P2_PDM))
x = one6th*(1.-2.0*c)
x = one6th*(ONE-TWO*c)
Phi=(0.5+x)+(0.5-x)*r
if (method.eq.P2) then
limit=Phi
......@@ -1003,9 +1007,9 @@
limit=max(_ZERO_,min(Phi,2./(1.-c),2.*r/(c+1.e-10)))
end if
case (Superbee)
limit=max(_ZERO_, min(1.0, 2.0*r), min(r,2.0) )
limit=max(_ZERO_, min(ONE, TWO*r), min(r,TWO) )
case (MUSCL)
limit=max(_ZERO_,min(2.0,2.0*r,0.5*(1.0+r)))
limit=max(_ZERO_,min(TWO,TWO*r,0.5*(ONE+r)))
case default
FATAL 'This is not so good - do_advection_3d()'
stop 'w_split_it_adv'
......
!$Id: grid_interpol.F90,v 1.6 2003-10-30 16:31:36 kbk Exp $
!$Id: grid_interpol.F90,v 1.7 2003-12-16 16:50:40 kbk Exp $
#include "cppdefs.h"
#ifndef HALO
#define HALO 0
......@@ -40,7 +40,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: grid_interpol.F90,v $
! Revision 1.6 2003-10-30 16:31:36 kbk
! Revision 1.7 2003-12-16 16:50:40 kbk
! added support for Intel/IFORT compiler - expanded TABS, same types in subroutine calls
!
! Revision 1.6 2003/10/30 16:31:36 kbk
! check validity of meteo interpolation coeffcients
!
! Revision 1.5 2003/06/30 05:45:26 kbk
......
!$Id: ncdf_3d_bdy.F90,v 1.7 2003-10-07 15:10:42 kbk Exp $
!$Id: ncdf_3d_bdy.F90,v 1.8 2003-12-16 16:50:41 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -43,7 +43,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: ncdf_3d_bdy.F90,v $
! Revision 1.7 2003-10-07 15:10:42 kbk
! Revision 1.8 2003-12-16 16:50:41 kbk
! added support for Intel/IFORT compiler - expanded TABS, same types in subroutine calls
!
! Revision 1.7 2003/10/07 15:10:42 kbk
! use zax_dim as argument to dim_len
!
! Revision 1.6 2003/08/03 09:19:41 kbk
......@@ -379,7 +382,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: ncdf_3d_bdy.F90,v $
! Revision 1.7 2003-10-07 15:10:42 kbk
! Revision 1.8 2003-12-16 16:50:41 kbk
! added support for Intel/IFORT compiler - expanded TABS, same types in subroutine calls
!
! Revision 1.7 2003/10/07 15:10:42 kbk
! use zax_dim as argument to dim_len
!
! Revision 1.6 2003/08/03 09:19:41 kbk
......
!$Id: ncdf_meteo.F90,v 1.8 2003-11-03 14:34:54 kbk Exp $
!$Id: ncdf_meteo.F90,v 1.9 2003-12-16 16:50:41 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -75,7 +75,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: ncdf_meteo.F90,v $
! Revision 1.8 2003-11-03 14:34:54 kbk
! Revision 1.9 2003-12-16 16:50:41 kbk
! added support for Intel/IFORT compiler - expanded TABS, same types in subroutine calls
!
! Revision 1.8 2003/11/03 14:34:54 kbk
! use time_var_id in addition to time_id
!
! Revision 1.7 2003/10/30 16:31:36 kbk
......@@ -814,7 +817,7 @@
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
REALTYPE, intent(out):: outf(:,:)
REALTYPE, intent(out) :: outf(:,:)
!
! !REVISION HISTORY:
!
......
!$Id: output.F90,v 1.6 2003-09-30 09:44:27 kbk Exp $
!$Id: output.F90,v 1.7 2003-12-16 16:50:41 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -51,7 +51,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: output.F90,v $
! Revision 1.6 2003-09-30 09:44:27 kbk
! Revision 1.7 2003-12-16 16:50:41 kbk
! added support for Intel/IFORT compiler - expanded TABS, same types in subroutine calls
!
! Revision 1.6 2003/09/30 09:44:27 kbk
! hotout=0 -> save hot-files at last time step only
!
! Revision 1.5 2003/09/16 07:45:30 kbk
......@@ -328,7 +331,7 @@
! !LOCAL VARIABLES
integer, save :: n=0
logical, save :: continuous=.false.
integer :: n,jd,secs
integer :: jd,secs
REALTYPE :: dt
!
!EOP
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment