<p><b>dwj07@fsu.edu</b> 2013-04-04 11:59:45 -0600 (Thu, 04 Apr 2013)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Changing variable names to reflect changes in ocean_projects/variable_name_change branch.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/basin_renamed_variables/src/Makefile
===================================================================
--- branches/ocean_projects/basin_renamed_variables/src/Makefile 2013-04-04 17:13:09 UTC (rev 2727)
+++ branches/ocean_projects/basin_renamed_variables/src/Makefile 2013-04-04 17:59:45 UTC (rev 2728)
@@ -13,12 +13,20 @@
#LDFLAGS = -O3
# ifort
-FC = ifort
-CC = icc
-FFLAGS = -real-size 64 #-g -traceback -check all
-CFLAGS = #-g
-LDFLAGS = #-g -traceback -check all
+#FC = ifort
+#CC = icc
+#FFLAGS = -real-size 64 #-g -traceback -check all
+#CFLAGS = #-g
+#LDFLAGS = #-g -traceback -check all
+# gfortran
+FC = gfortran
+CC = gcc
+FFLAGS = -fdefault-real-8
+CFLAGS =
+LDFLAGS =
+
+
# absoft
#FC = f90
#CC = gcc
@@ -32,7 +40,7 @@
CPPFLAGS =
CPPINCLUDES =
INCLUDES = -I$(NETCDF)/include
-LIBS = -L$(NETCDF)/lib -lnetcdf
+LIBS = -L$(NETCDF)/lib -lnetcdf -lnetcdff
RM = rm -f
Modified: branches/ocean_projects/basin_renamed_variables/src/basin.F
===================================================================
--- branches/ocean_projects/basin_renamed_variables/src/basin.F 2013-04-04 17:13:09 UTC (rev 2727)
+++ branches/ocean_projects/basin_renamed_variables/src/basin.F 2013-04-04 17:59:45 UTC (rev 2728)
@@ -42,9 +42,9 @@
real, allocatable, dimension(:,:) :: kiteAreasOnVertex, weightsOnEdge
real, allocatable, dimension(:) :: fEdge, fVertex, bottomDepth, work1
-real, allocatable, dimension(:,:) :: u_src
-real, allocatable, dimension(:,:,:) :: u, v, h
-real, allocatable, dimension(:,:,:) :: rho
+real, allocatable, dimension(:,:) :: normalVelocityForcing
+real, allocatable, dimension(:,:,:) :: normalVelocity, tangentialVelocity, layerThickness
+real, allocatable, dimension(:,:,:) :: density
integer nlon, nlat, ndepth
real(kind=4), allocatable, dimension(:) :: t_lon, t_lat, depth_t
@@ -79,10 +79,10 @@
real, allocatable, dimension(:,:) :: kiteAreasOnVertexNew, weightsOnEdgeNew, normalsNew
real, allocatable, dimension(:) :: fEdgeNew, fVertexNew, bottomDepthNew
-real, allocatable, dimension(:,:) :: u_srcNew
+real, allocatable, dimension(:,:) :: normalVelocityForcingNew
real, allocatable, dimension(:,:) :: windStressMonthlyNew
-real, allocatable, dimension(:,:,:) :: uNew, hNew
-real, allocatable, dimension(:,:,:) :: rhoNew, temperatureNew, salinityNew, tracer1New
+real, allocatable, dimension(:,:,:) :: normalVelocityNew, layerThicknessNew
+real, allocatable, dimension(:,:,:) :: densityNew, temperatureNew, salinityNew, tracer1New
real, allocatable, dimension(:) :: temperatureRestoreNew, salinityRestoreNew
real, allocatable, dimension(:,:) :: temperatureRestoreMonthlyNew, salinityRestoreMonthlyNew
@@ -113,7 +113,7 @@
amplify_acc_wind
integer :: nVertLevelsMOD, top_layers_without_land
-real (kind=8) :: sphere_radius, h_total_max, u_src_max, f0, beta, omega, Lx, &
+real (kind=8) :: sphere_radius, h_total_max, normalVelocityForcing_max, f0, beta, omega, Lx, &
uniform_T, uniform_S, uniform_tracer1, &
amp_wind_factor, amp_wind_center_lat, amp_wind_spread_lat
@@ -123,7 +123,7 @@
zLevel_thickness, bottom_topography, initial_conditions, &
eliminate_inland_seas, load_woce_IC, write_OpenDX_flag, monthly_forcing, check_mesh, &
cut_domain_from_sphere, solid_boundary_in_y, solid_boundary_in_x, &
- top_layers_without_land, h_total_max, u_src_max, f0, beta, omega, Lx, &
+ top_layers_without_land, h_total_max, normalVelocityForcing_max, f0, beta, omega, Lx, &
uniform_T, uniform_S, uniform_tracer1, &
amplify_acc_wind, amp_wind_factor, amp_wind_center_lat, amp_wind_spread_lat
@@ -161,7 +161,7 @@
top_layers_without_land = 3
h_total_max = 2000.0 ! total layer thickness, for equally spaced case
-u_src_max = 0.1 ! max wind stress, N/m2
+normalVelocityForcing_max = 0.1 ! max wind stress, N/m2
f0 = -1.1e-4 ! Coriolis parameter
beta = 1.4e-11
omega = 7.29212e-5 ! rotation rate of earth
@@ -485,25 +485,25 @@
dtr = pi/180.0
! defaults
-hNew = 100.0
+layerThicknessNew = 100.0
temperatureNew = 1.0
salinityNew = 1.0
tracer1New = 1.0
-uNew = 0
-u_srcNew = 0
-rhoNew = 1025.0
+normalVelocityNew = 0
+normalVelocityForcingNew = 0
+densityNew = 1025.0
if (initial_conditions.eq.'uniform_TS') then
temperatureNew = uniform_T !10.0
salinityNew = uniform_S !34.0
tracer1New = uniform_tracer1 !1.0
- uNew = 0.0
- u_srcNew = 0.0
+ normalVelocityNew = 0.0
+ normalVelocityForcingNew = 0.0
do iCell=1,nCellsNew
do k=1, nVertLevelsMod
- hNew(1,k,iCell) = hZLevel(k)
+ layerThicknessNew(1,k,iCell) = hZLevel(k)
enddo
enddo
@@ -519,12 +519,12 @@
salinityNew(1,:,:) = 35.0
Tracer1New(1,:,:) = 1.0
- uNew = 0.0
- u_srcNew = 0.0
+ normalVelocityNew = 0.0
+ normalVelocityForcingNew = 0.0
do iCell=1,nCellsNew
do k=1,nVertLevelsMod
- hNew(1,k,iCell) = hZLevel(k)
+ layerThicknessNew(1,k,iCell) = hZLevel(k)
enddo
enddo
@@ -540,12 +540,12 @@
salinityNew(1,:,:) = 35.0
Tracer1New(1,:,:) = 1.0
- uNew = 0.0
- u_srcNew = 0.0
+ normalVelocityNew = 0.0
+ normalVelocityForcingNew = 0.0
do iCell=1,nCellsNew
do k=1,nVertLevelsMod
- hNew(1,k,iCell) = bottomDepthNew(iCell) / nVertLevelsMOD
+ layerThicknessNew(1,k,iCell) = bottomDepthNew(iCell) / nVertLevelsMOD
enddo
enddo
@@ -554,19 +554,19 @@
fEdgeNew(:) = 0.0
fVertexNew(:) = 0.0
bottomDepthNew(:) = 0.0
- uNew(:,:,:) = 0.0
+ normalVelocityNew(:,:,:) = 0.0
! basin-mod
! setting for three levels - Set h values for isopycnal system
write(6,*) ' setting three levels for isopycnal system'
if(nVertLevelsMOD .eq. 3) then
- hNew(1,1,:) = 500.0
- hNew(1,2,:) = 1250.0
- hNew(1,3,:) = 3250.0
- bottomDepthNew(:) = -( hNew(1,1,:) + hNew(1,2,:) + hNew(1,3,:) )
+ layerThicknessNew(1,1,:) = 500.0
+ layerThicknessNew(1,2,:) = 1250.0
+ layerThicknessNew(1,3,:) = 3250.0
+ bottomDepthNew(:) = -( layerThicknessNew(1,1,:) + layerThicknessNew(1,2,:) + layerThicknessNew(1,3,:) )
else
- hNew(1,1,:) = 3250.0
- bottomDepthNew(:) = -( hNew(1,1,:) )
+ layerThicknessNew(1,1,:) = 3250.0
+ bottomDepthNew(:) = -( layerThicknessNew(1,1,:) )
endif
@@ -582,18 +582,18 @@
enddo
r = r/float(nCells)
work1(:) = work1(:) - r
- hNew(1,1,:) = hNew(1,1,:) + 1.0*work1(:)
+ layerThicknessNew(1,1,:) = layerThicknessNew(1,1,:) + 1.0*work1(:)
if(nVertLevelsMOD .gt. 1) then
- hNew(1,2,:) = hNew(1,2,:) - 1.0*work1(:)
+ layerThicknessNew(1,2,:) = layerThicknessNew(1,2,:) - 1.0*work1(:)
endif
! basin-mod
!Specify Density values for isopycnal levels
write(6,*) ' setting density'
- rhoNew(1,1,:) = 1010.0
+ densityNew(1,1,:) = 1010.0
if(nVertLevelsMOD .eq. 3) then
- rhoNew(1,2,:) = 1011.0
- rhoNew(1,3,:) = 1012.0
+ densityNew(1,2,:) = 1011.0
+ densityNew(1,3,:) = 1012.0
endif
! basin-mod
@@ -653,8 +653,8 @@
! basin-mod
! set forcing for isopycnal levels
- write(6,*) 'setting u_src - wind forcing'
- u_srcNew = 0.0
+ write(6,*) 'setting normalVelocityForcing - wind forcing'
+ normalVelocityForcingNew = 0.0
if(on_a_sphere.eq.'YES') then
latmin = -60*dtr
latmax = -10*dtr
@@ -664,13 +664,13 @@
latmid = (latmin+latmax)/2.0
r = 10.0*dtr
- write(6,*) 'u_src info', latmin, latmax, latmid, r
+ write(6,*) 'normalVelocityForcing info', latmin, latmax, latmid, r
do i = 1,nEdgesNew
lattmp = latEdgeNew(i)
iCell1 = cellsOnEdgeNew(1,i)
iCell2 = cellsOnEdgeNew(2,i)
if(iCell1>0.and.iCell2>0) then
- pert = u_src_max * exp(-(lattmp-latmid)**2/(r**2))
+ pert = normalVelocityForcing_max * exp(-(lattmp-latmid)**2/(r**2))
ulat = latEdgeNew(i)
ulon = lonEdgeNew(i) + 0.05
@@ -688,7 +688,7 @@
dotProd = normalsNew(1,i)*xin + normalsNew(2,i)*yin + normalsNew(3,i)*zin
- u_srcNew(1,i) = pert * dotProd
+ normalVelocityForcingNew(1,i) = pert * dotProd
write(8,*) lattmp,pert,dotProd
endif
enddo
@@ -702,19 +702,19 @@
iCell1 = cellsOnEdgeNew(1,i)
iCell2 = cellsOnEdgeNew(2,i)
if(iCell1>0.and.iCell2>0) then
- pert = u_src_max * exp(-(ytmp-ymid)**2/(r**2))
+ pert = normalVelocityForcing_max * exp(-(ytmp-ymid)**2/(r**2))
write(8,*) ytmp,pert
- u_srcNew(1,i) = pert * normalsNew(1,i)
+ normalVelocityForcingNew(1,i) = pert * normalsNew(1,i)
endif
enddo
endif
- write(6,*) ' u_srcNew ', minval(u_srcNew), maxval(u_srcNew)
+ write(6,*) ' normalVelocityForcingNew ', minval(normalVelocityForcingNew), maxval(normalVelocityForcingNew)
elseif (initial_conditions.eq.'realistic_WOCE') then
-u_srcNew = 0.0
+normalVelocityForcingNew = 0.0
windStressMonthlyNew = 0.0
do iEdge=1,nEdgesNew
xin = xEdgeNew(iEdge)
@@ -737,7 +737,7 @@
call transform_from_lonlat_to_xyz(xin,yin,zin,ulon,ulat,ux,uy,uz)
if(boundaryEdgeNew(1,iEdge).eq.1) then
- u_srcNew(1,iEdge) = 0.0
+ normalVelocityForcingNew(1,iEdge) = 0.0
else
iCell1 = cellsOnEdgeNew(1,iEdge)
iCell2 = cellsOnEdgeNew(2,iEdge)
@@ -745,7 +745,7 @@
q(1) = xCellNew(iCell2); q(2) = yCellNew(iCell2); q(3) = zCellNew(iCell2)
q = q - p
call unit_vector_in_3space(q)
- u_srcNew(1,iEdge) = ux*q(1) + uy*q(2) + uz*q(3)
+ normalVelocityForcingNew(1,iEdge) = ux*q(1) + uy*q(2) + uz*q(3)
endif
if(monthly_forcing) then
@@ -768,7 +768,7 @@
call unit_vector_in_3space(q)
! repeat
windStressMonthlyNew(iMonth,iEdge) = ux*q(1) + uy*q(2) + uz*q(3)
- ! windStressMonthlyNew(iMonth,iEdge) = u_srcNew(1,iEdge)
+ ! windStressMonthlyNew(iMonth,iEdge) = normalVelocityForcingNew(1,iEdge)
endif
enddo
else
@@ -801,7 +801,7 @@
if(load_woce_IC) then
iNoData = 0
do iCell=1,nCellsNew
- hNew(1,:,iCell) = dz(:)
+ layerThicknessNew(1,:,iCell) = dz(:)
! if(mod(iCell,100).eq.0) write(6,*) 'load_woce_IC t and s',iCell
rlon = lonCellNew(iCell)/dtr
rlat = latCellNew(iCell)/dtr
@@ -1226,11 +1226,11 @@
allocate(fVertex(nVertices))
allocate(bottomDepth(nCells))
allocate(work1(nCells))
-allocate(u_src(nVertLevels,nEdges))
-allocate(u(1,nVertLevels,nEdges))
-allocate(v(1,nVertLevels,nEdges))
-allocate(h(1,nVertLevels,nCells))
-allocate(rho(1,nVertLevels,nCells))
+allocate(normalVelocityForcing(nVertLevels,nEdges))
+allocate(normalVelocity(1,nVertLevels,nEdges))
+allocate(tangentialVelocity(1,nVertLevels,nEdges))
+allocate(layerThickness(1,nVertLevels,nCells))
+allocate(density(1,nVertLevels,nCells))
xCell=0; yCell=0; zCell=0; latCell=0; lonCell=0; meshDensity=1.0
xEdge=0; yEdge=0; zEdge=0; latEdge=0; lonEdge=0
@@ -1243,8 +1243,8 @@
cellsOnCell=0; verticesOnCell=0; verticesOnEdge=0
edgesOnVertex=0; cellsOnVertex=0; kiteAreasOnVertex=0
-fEdge=0; fVertex=0; bottomDepth=0; u_src=0; work1=0
-u=0; v=0; h=0; rho=0
+fEdge=0; fVertex=0; bottomDepth=0; normalVelocityForcing=0; work1=0
+normalVelocity=0; tangentialVelocity=0; layerThickness=0; density=0
call read_netcdf_fields( &
@@ -1288,9 +1288,9 @@
fEdge, &
fVertex, &
bottomDepth, &
- u, &
- v, &
- h &
+ normalVelocity, &
+ tangentialVelocity, &
+ layerThickness &
)
write(6,*) ' values from read grid, min/max'
@@ -1333,9 +1333,9 @@
write(6,*) ' fEdge : ', minval(fEdge), maxval(fEdge)
write(6,*) ' fVertex : ', minval(fVertex), maxval(fVertex)
write(6,*) ' bottomDepth : ', minval(bottomDepth), maxval(bottomDepth)
-write(6,*) ' u : ', minval(u), maxval(u)
-write(6,*) ' v : ', minval(v), maxval(v)
-write(6,*) ' h : ', minval(h), maxval(h)
+write(6,*) ' normalVelocity : ', minval(normalVelocity), maxval(normalVelocity)
+write(6,*) ' tangentialVelocity : ', minval(tangentialVelocity), maxval(tangentialVelocity)
+write(6,*) ' layerThickness : ', minval(layerThickness), maxval(layerThickness)
end subroutine read_grid
@@ -1416,11 +1416,11 @@
bottomDepthNew, &
boundaryEdgeNew, &
boundaryVertexNew, &
- u_srcNew, &
+ normalVelocityForcingNew, &
windStressMonthlyNew, &
- uNew, &
- hNew, &
- rhoNew, &
+ normalVelocityNew, &
+ layerThicknessNew, &
+ densityNew, &
temperatureNew, &
salinityNew, &
tracer1New, &
@@ -1428,7 +1428,6 @@
salinityRestoreNew, &
temperatureRestoreMonthlyNew, &
salinityRestoreMonthlyNew, &
- hZLevel, &
refBottomDepth &
)
@@ -1789,11 +1788,11 @@
allocate(fEdgeNew(nEdgesNew))
allocate(fVertexNew(nVerticesNew))
allocate(bottomDepthNew(nCellsNew))
-allocate(u_srcNew(nVertLevelsNew,nEdgesNew))
+allocate(normalVelocityForcingNew(nVertLevelsNew,nEdgesNew))
allocate(windStressMonthlyNew(nMonths,nEdgesNew))
-allocate(uNew(1,nVertLevelsNew,nEdgesNew))
-allocate(hNew(1,nVertLevelsNew,nCellsNew))
-allocate(rhoNew(1,nVertLevelsNew,nCellsNew))
+allocate(normalVelocityNew(1,nVertLevelsNew,nEdgesNew))
+allocate(layerThicknessNew(1,nVertLevelsNew,nCellsNew))
+allocate(densityNew(1,nVertLevelsNew,nCellsNew))
allocate(temperatureNew(1,nVertLevelsNew,nCellsNew))
allocate(salinityNew(1,nVertLevelsNew,nCellsNew))
allocate(tracer1New(1,nVertLevelsNew,nCellsNew))
@@ -1809,8 +1808,8 @@
xEdgeNew=0; yEdgeNew=0; zEdgeNew=0; latEdgeNew=0; lonEdgeNew=0
xVertexNew=0; yVertexNew=0; zVertexNew=0; latVertexNew=0; lonVertexNew=0
-fEdgeNew=0; fVertexNew=0; bottomDepthNew=0; u_srcNew=0; windStressMonthlyNew = 0
-uNew=0; hNew=0; rhoNew=0
+fEdgeNew=0; fVertexNew=0; bottomDepthNew=0; normalVelocityForcingNew=0; windStressMonthlyNew = 0
+normalVelocityNew=0; layerThicknessNew=0; densityNew=0
temperatureNew=0; salinityNew=0; tracer1New=0;
temperatureRestoreNew = 0.0
Modified: branches/ocean_projects/basin_renamed_variables/src/module_read_netcdf.F
===================================================================
--- branches/ocean_projects/basin_renamed_variables/src/module_read_netcdf.F 2013-04-04 17:13:09 UTC (rev 2727)
+++ branches/ocean_projects/basin_renamed_variables/src/module_read_netcdf.F 2013-04-04 17:59:45 UTC (rev 2728)
@@ -48,10 +48,10 @@
integer :: rdVarIDkiteAreasOnVertex
integer :: rdVarIDfEdge
integer :: rdVarIDfVertex
- integer :: rdVarIDh_s
- integer :: rdVarIDu
- integer :: rdVarIDv
- integer :: rdVarIDh
+ integer :: rdVarIDbottomDepth
+ integer :: rdVarIDnormalVelocity
+ integer :: rdVarIDtangentialVelocity
+ integer :: rdVarIDlayerThickness
integer :: rdLocalnCells
integer :: rdLocalnEdges
@@ -165,10 +165,10 @@
nferr = nf_inq_varid(rd_ncid, 'kiteAreasOnVertex', rdVarIDkiteAreasOnVertex)
nferr = nf_inq_varid(rd_ncid, 'fEdge', rdVarIDfEdge)
nferr = nf_inq_varid(rd_ncid, 'fVertex', rdVarIDfVertex)
- nferr = nf_inq_varid(rd_ncid, 'h_s', rdVarIDh_s)
- nferr = nf_inq_varid(rd_ncid, 'u', rdVarIDu)
- nferr = nf_inq_varid(rd_ncid, 'v', rdVarIDv)
- nferr = nf_inq_varid(rd_ncid, 'h', rdVarIDh)
+ nferr = nf_inq_varid(rd_ncid, 'bottomDepth', rdVarIDbottomDepth)
+ nferr = nf_inq_varid(rd_ncid, 'normalVelocity', rdVarIDnormalVelocity)
+ nferr = nf_inq_varid(rd_ncid, 'tangentialVelocity', rdVarIDtangentialVelocity)
+ nferr = nf_inq_varid(rd_ncid, 'layerThickness', rdVarIDlayerThickness)
end subroutine read_netcdf_init
@@ -213,10 +213,10 @@
kiteAreasOnVertex, &
fEdge, &
fVertex, &
- h_s, &
- u, &
- v, &
- h &
+ bottomDepth, &
+ normalVelocity, &
+ tangentialVelocity, &
+ layerThickness &
)
implicit none
@@ -262,10 +262,10 @@
real (kind=8), dimension(:,:), intent(out) :: kiteAreasOnVertex
real (kind=8), dimension(:), intent(out) :: fEdge
real (kind=8), dimension(:), intent(out) :: fVertex
- real (kind=8), dimension(:), intent(out) :: h_s
- real (kind=8), dimension(:,:,:), intent(out) :: u
- real (kind=8), dimension(:,:,:), intent(out) :: v
- real (kind=8), dimension(:,:,:), intent(out) :: h
+ real (kind=8), dimension(:), intent(out) :: bottomDepth
+ real (kind=8), dimension(:,:,:), intent(out) :: normalVelocity
+ real (kind=8), dimension(:,:,:), intent(out) :: tangentialVelocity
+ real (kind=8), dimension(:,:,:), intent(out) :: layerThickness
logical :: meshDensityPresent
@@ -485,25 +485,25 @@
start1(1) = 1
count1( 1) = rdLocalnCells
count1( 1) = rdLocalnCells
- nferr = nf_get_vara_double(rd_ncid, rdVarIDh_s, start1, count1, h_s)
+ nferr = nf_get_vara_double(rd_ncid, rdVarIDbottomDepth, start1, count1, bottomDepth)
start3(3) = time
count3( 1) = rdLocalnVertLevels
count3( 2) = rdLocalnEdges
count3( 3) = 1
- nferr = nf_get_vara_double(rd_ncid, rdVarIDu, start3, count3, u)
+ nferr = nf_get_vara_double(rd_ncid, rdVarIDnormalVelocity, start3, count3, normalVelocity)
start3(3) = time
count3( 1) = rdLocalnVertLevels
count3( 2) = rdLocalnEdges
count3( 3) = 1
- nferr = nf_get_vara_double(rd_ncid, rdVarIDv, start3, count3, v)
+ nferr = nf_get_vara_double(rd_ncid, rdVarIDtangentialVelocity, start3, count3, tangentialVelocity)
start3(3) = time
count3( 1) = rdLocalnVertLevels
count3( 2) = rdLocalnCells
count3( 3) = 1
- nferr = nf_get_vara_double(rd_ncid, rdVarIDh, start3, count3, h)
+ nferr = nf_get_vara_double(rd_ncid, rdVarIDlayerThickness, start3, count3, layerThickness)
end subroutine read_netcdf_fields
Modified: branches/ocean_projects/basin_renamed_variables/src/module_write_netcdf.F
===================================================================
--- branches/ocean_projects/basin_renamed_variables/src/module_write_netcdf.F 2013-04-04 17:13:09 UTC (rev 2727)
+++ branches/ocean_projects/basin_renamed_variables/src/module_write_netcdf.F 2013-04-04 17:59:45 UTC (rev 2728)
@@ -51,13 +51,13 @@
integer :: wrVarIDfEdge
integer :: wrVarIDfVertex
integer :: wrVarIDbottomDepth
- integer :: wrVarIDu
+ integer :: wrVarIDnormalVelocity
integer :: wrVarIDboundaryEdge
integer :: wrVarIDboundaryVertex
- integer :: wrVarIDu_src
+ integer :: wrVarIDnormalVelocityForcing
integer :: wrVarIDwindStressMonthly
- integer :: wrVarIDh
- integer :: wrVarIDrho
+ integer :: wrVarIDlayerThickness
+ integer :: wrVarIDdensity
integer :: wrVarIDtemperature
integer :: wrVarIDsalinity
integer :: wrVarIDtracer1
@@ -65,7 +65,6 @@
integer :: wrVarIDsalinityRestore
integer :: wrVarIDtemperatureRestoreMonthly
integer :: wrVarIDsalinityRestoreMonthly
- integer :: wrVarIDhZLevel
integer :: wrVarIDrefBottomDepth
integer :: wrLocalnCells
@@ -239,13 +238,11 @@
nferr = nf_def_var(wr_ncid, 'salinityRestoreMonthly', NF_DOUBLE, 2, dimlist, wrVarIDsalinityRestoreMonthly)
dimlist( 1) = wrDimIDnVertLevels
- nferr = nf_def_var(wr_ncid, 'hZLevel', NF_DOUBLE, 1, dimlist, wrVarIDhZLevel)
- dimlist( 1) = wrDimIDnVertLevels
nferr = nf_def_var(wr_ncid, 'refBottomDepth', NF_DOUBLE, 1, dimlist, wrVarIDrefBottomDepth)
dimlist( 1) = wrDimIDnVertLevels
dimlist( 2) = wrDimIDnEdges
dimlist( 3) = wrDimIDTime
- nferr = nf_def_var(wr_ncid, 'u', NF_DOUBLE, 3, dimlist, wrVarIDu)
+ nferr = nf_def_var(wr_ncid, 'normalVelocity', NF_DOUBLE, 3, dimlist, wrVarIDnormalVelocity)
dimlist( 1) = wrDimIDnVertLevels
dimlist( 2) = wrDimIDnEdges
nferr = nf_def_var(wr_ncid, 'boundaryEdge', NF_INT, 2, dimlist, wrVarIDboundaryEdge)
@@ -254,7 +251,7 @@
nferr = nf_def_var(wr_ncid, 'boundaryVertex', NF_INT, 2, dimlist, wrVarIDboundaryVertex)
dimlist( 1) = wrDimIDnVertLevels
dimlist( 2) = wrDimIDnEdges
- nferr = nf_def_var(wr_ncid, 'u_src', NF_DOUBLE, 2, dimlist, wrVarIDu_src)
+ nferr = nf_def_var(wr_ncid, 'normalVelocityForcing', NF_DOUBLE, 2, dimlist, wrVarIDnormalVelocityForcing)
dimlist( 1) = wrDimIDnMonths
dimlist( 2) = wrDimIDnEdges
@@ -263,11 +260,11 @@
dimlist( 1) = wrDimIDnVertLevels
dimlist( 2) = wrDimIDnCells
dimlist( 3) = wrDimIDTime
- nferr = nf_def_var(wr_ncid, 'h', NF_DOUBLE, 3, dimlist, wrVarIDh)
+ nferr = nf_def_var(wr_ncid, 'layerThickness', NF_DOUBLE, 3, dimlist, wrVarIDlayerThickness)
dimlist( 1) = wrDimIDnVertLevels
dimlist( 2) = wrDimIDnCells
dimlist( 3) = wrDimIDTime
- nferr = nf_def_var(wr_ncid, 'rho', NF_DOUBLE, 3, dimlist, wrVarIDrho)
+ nferr = nf_def_var(wr_ncid, 'density', NF_DOUBLE, 3, dimlist, wrVarIDdensity)
dimlist( 1) = wrDimIDnVertLevels
dimlist( 2) = wrDimIDnCells
dimlist( 3) = wrDimIDTime
@@ -347,7 +344,6 @@
salinityRestore, &
temperatureRestoreMonthly, &
salinityRestoreMonthly, &
- hZLevel, &
refBottomDepth &
)
@@ -410,7 +406,6 @@
real (kind=8), dimension(:), intent(in) :: salinityRestore
real (kind=8), dimension(:,:), intent(in) :: temperatureRestoreMonthly
real (kind=8), dimension(:,:), intent(in) :: salinityRestoreMonthly
- real (kind=8), dimension(:), intent(in) :: hZLevel
real (kind=8), dimension(:), intent(in) :: refBottomDepth
@@ -617,7 +612,7 @@
start2(2) = 1
count2( 1) = wrLocalnVertLevels
count2( 2) = wrLocalnEdges
- nferr = nf_put_vara_double(wr_ncid, wrVarIDu_src, start2, count2, u_src)
+ nferr = nf_put_vara_double(wr_ncid, wrVarIDnormalVelocityForcing, start2, count2, u_src)
start2(2) = 1
@@ -634,9 +629,6 @@
count1( 1) = wrLocalnCells
nferr = nf_put_vara_double(wr_ncid, wrVarIDsalinityRestore, start1, count1, salinityRestore)
-
-
-
start2(2) = 1
count2( 1) = wrLocalnMonths
count2( 2) = wrLocalnCells
@@ -647,33 +639,27 @@
count2( 2) = wrLocalnCells
nferr = nf_put_vara_double(wr_ncid, wrVarIDsalinityRestoreMonthly, start2, count2, salinityRestoreMonthly)
-
-
start1(1) = 1
count1( 1) = wrLocalnVertLevels
- nferr = nf_put_vara_double(wr_ncid, wrVarIDhZLevel, start1, count1, hZLevel)
-
- start1(1) = 1
- count1( 1) = wrLocalnVertLevels
nferr = nf_put_vara_double(wr_ncid, wrVarIDrefBottomDepth, start1, count1, refBottomDepth)
start3(3) = time
count3( 1) = wrLocalnVertLevels
count3( 2) = wrLocalnEdges
count3( 3) = 1
- nferr = nf_put_vara_double(wr_ncid, wrVarIDu, start3, count3, u)
+ nferr = nf_put_vara_double(wr_ncid, wrVarIDnormalVelocity, start3, count3, u)
start3(3) = time
count3( 1) = wrLocalnVertLevels
count3( 2) = wrLocalnCells
count3( 3) = 1
- nferr = nf_put_vara_double(wr_ncid, wrVarIDh, start3, count3, h)
+ nferr = nf_put_vara_double(wr_ncid, wrVarIDlayerThickness, start3, count3, h)
start3(3) = time
count3( 1) = wrLocalnVertLevels
count3( 2) = wrLocalnCells
count3( 3) = 1
- nferr = nf_put_vara_double(wr_ncid, wrVarIDrho, start3, count3, rho)
+ nferr = nf_put_vara_double(wr_ncid, wrVarIDdensity, start3, count3, rho)
start3(3) = time
count3( 1) = wrLocalnVertLevels
</font>
</pre>