Commit fca6139d authored by Knut's avatar Knut

Merge remote-tracking branch 'origin/master' into output

parents ccfd01bb 6cbbed0d
......@@ -182,16 +182,18 @@
case(0)
LEVEL3 'getting initial fields from hotstart'
case(1)
LEVEL3 'setting to constant value'
LEVEL3 'setting to constant value ',real(salt_const)
forall(i=imin:imax,j=jmin:jmax, az(i,j) .ne. 0) &
S(i,j,:) = salt_const
case(2)
LEVEL3 'using profile'
LEVEL4 trim(salt_file)
call read_profile(salt_file,nmax,zlev,prof,n)
call ver_interpol(n,zlev,prof,imin,jmin,imax,jmax,kmax, &
az,H,hn,S)
case(3)
LEVEL3 'interpolating from 3D field'
LEVEL4 trim(salt_file)
call get_3d_field(salt_file,salt_name,salt_field_no,.true.,S)
case default
FATAL 'Not valid salt_method specified'
......
......@@ -259,16 +259,18 @@ end interface
case(0)
LEVEL3 'getting initial fields from hotstart'
case(1)
LEVEL3 'setting to constant value'
LEVEL3 'setting to constant value ',real(temp_const)
forall(i=imin:imax,j=jmin:jmax, az(i,j) .ne. 0) &
T(i,j,:) = temp_const
case(2)
LEVEL3 'using profile'
LEVEL4 trim(temp_file)
call read_profile(temp_file,nmax,zlev,prof,n)
call ver_interpol(n,zlev,prof,imin,jmin,imax,jmax,kmax, &
az,H,hn,T)
case(3)
LEVEL3 'interpolating from 3D field'
LEVEL4 trim(temp_file)
call get_3d_field(temp_file,temp_name,temp_field_no,.true.,T)
case default
FATAL 'Not valid temp_method specified'
......
......@@ -174,6 +174,7 @@ EXTRA_LIBS += -lbio$(buildtype)
endif
# Where does the NetCDF include file and library reside.
NETCDF_VERSION?=NETCDF4
ifeq ($(NETCDF_VERSION),NETCDF4)
DEFINES += -DNETCDF4
......
......@@ -247,8 +247,8 @@
call wait_halo(H_TAG)
az = 0
where (H .gt. Hland+SMALL)
az=1
where (H(imin:imax,jmin:jmax) .gt. Hland+SMALL)
az(imin:imax,jmin:jmax) = 1
end where
call update_2d_halo(H,H,az,imin,jmin,imax,jmax,H_TAG,mirror=.true.)
......
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