<p><b>sprice@lanl.gov</b> 2011-08-31 14:39:29 -0600 (Wed, 31 Aug 2011)</p><p>branch commit (land ice): more cleanup of altered basin code; removed ocean vars not needed; removed read TS module from build.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/land_ice/icesheet/src/Makefile
===================================================================
--- branches/land_ice/icesheet/src/Makefile 2011-08-31 19:49:07 UTC (rev 970)
+++ branches/land_ice/icesheet/src/Makefile 2011-08-31 20:39:29 UTC (rev 971)
@@ -45,12 +45,11 @@
utilities.o \
module_read_netcdf.o \
module_read_topo.o \
- module_read_TS.o \
module_write_netcdf.o
all: map
-icesheet.o: utilities.o module_write_netcdf.o module_read_netcdf.o module_read_topo.o module_read_TS.o
+icesheet.o: utilities.o module_write_netcdf.o module_read_netcdf.o module_read_topo.o
map: $(OBJS)
$(FC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
Modified: branches/land_ice/icesheet/src/icesheet.F
===================================================================
--- branches/land_ice/icesheet/src/icesheet.F 2011-08-31 19:49:07 UTC (rev 970)
+++ branches/land_ice/icesheet/src/icesheet.F 2011-08-31 20:39:29 UTC (rev 971)
@@ -2,7 +2,6 @@
use read_netcdf
use read_topo
-use read_TS
use write_netcdf
use utilities
@@ -42,22 +41,11 @@
integer, allocatable, dimension(:,:) :: cellsOnVertex, edgesOnVertex
real, allocatable, dimension(:) :: areaCell, areaTriangle, dcEdge, dvEdge, angleEdge
real, allocatable, dimension(:,:) :: kiteAreasOnVertex, weightsOnEdge
+real, allocatable, dimension(:) :: fEdge, fVertex, work1
-real, allocatable, dimension(:) :: fEdge, fVertex, h_s, work1
-real, allocatable, dimension(:,:) :: u_src
-real, allocatable, dimension(:,:,:) :: u, v, h
-real, allocatable, dimension(:,:,:) :: rho
-
! ice sheet variables
real(kind=4), allocatable, dimension(:,:) :: thck, topg
-integer nlon, nlat, ndepth
-real(kind=4), allocatable, dimension(:) :: t_lon, t_lat, depth_t
-real(kind=4), allocatable, dimension(:,:) :: mTEMP, mSALT
-real(kind=4), allocatable, dimension(:,:,:) :: TEMP, SALT
-real(kind=4), allocatable, dimension(:,:) :: TAUX, TAUY
-
-
real, dimension(1) :: dz
! Step 1: Set the number of Vertical levels
@@ -116,12 +104,10 @@
real, allocatable, dimension(:) :: areaCellNew, areaTriangleNew, dcEdgeNew, dvEdgeNew, angleEdgeNew
real, allocatable, dimension(:,:) :: kiteAreasOnVertexNew, weightsOnEdgeNew, normalsNew
-real, allocatable, dimension(:) :: fEdgeNew, fVertexNew, h_sNew
-real, allocatable, dimension(:,:) :: u_srcNew
-real, allocatable, dimension(:,:,:) :: uNew, vNew, hNew
-real, allocatable, dimension(:,:,:) :: rhoNew, temperatureNew, salinityNew, tracer1New
-real, allocatable, dimension(:) :: temperatureRestoreNew, salinityRestoreNew
+real, allocatable, dimension(:) :: fEdgeNew, fVertexNew
+real, allocatable, dimension(:,:,:) :: hNew
+
!ice sheet variables
real(kind=8), allocatable, dimension(:,:,:) :: thckNew, topgNew
real(kind=4), allocatable, dimension(:) :: thckdata, topgdata
@@ -274,13 +260,6 @@
pi = 4.0*atan(1.0)
dtr = pi/180.0
-hNew = 10.0
-salinityNew = 1.0
-temperatureNew = 1.0
-tracer1New = 1.0
-uNew = 0
-vNew = 0
-
write(6,*) ' done get_init_conditions'
end subroutine get_init_conditions
@@ -504,13 +483,7 @@
allocate(fEdge(nEdges))
allocate(fVertex(nVertices))
-allocate(h_s(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))
xCell=0; yCell=0; zCell=0; latCell=0; lonCell=0
xEdge=0; yEdge=0; zEdge=0; latEdge=0; lonEdge=0
@@ -523,10 +496,7 @@
cellsOnCell=0; verticesOnCell=0; verticesOnEdge=0
edgesOnVertex=0; cellsOnVertex=0; kiteAreasOnVertex=0
-fEdge=0; fVertex=0; h_s=0; u_src=0; work1=0
-u=0; v=0; h=0; rho=0
-
call read_netcdf_fields( &
time, &
latCell, &
@@ -565,11 +535,7 @@
cellsOnVertex, &
kiteAreasOnVertex, &
fEdge, &
- fVertex, &
- h_s, &
- u, &
- v, &
- h &
+ fVertex &
)
write(6,*) ' values from read grid, min/max'
@@ -610,10 +576,6 @@
write(6,*) ' kiteAreasOnVertex : ', minval(kiteAreasOnVertex), maxval(kiteAreasOnVertex)
write(6,*) ' fEdge : ', minval(fEdge), maxval(fEdge)
write(6,*) ' fVertex : ', minval(fVertex), maxval(fVertex)
-write(6,*) ' h_s : ', minval(h_s), maxval(h_s)
-write(6,*) ' u : ', minval(u), maxval(u)
-write(6,*) ' v : ', minval(v), maxval(v)
-write(6,*) ' h : ', minval(h), maxval(h)
end subroutine read_grid
@@ -689,21 +651,11 @@
kiteAreasOnVertexNew, &
fEdgeNew, &
fVertexNew, &
-! h_sNew, &
boundaryEdgeNew, &
boundaryVertexNew, &
-! u_srcNew, &
-! uNew, &
-! vNew, &
hNew, &
-! rhoNew, &
-! temperatureNew, &
-! salinityNew, &
-! tracer1New, &
-! temperatureRestoreNew, &
-! salinityRestoreNew, &
- thckNew, &
- topgNew &
+ topgNew, &
+ thckNew &
)
call write_netcdf_finalize
@@ -970,37 +922,14 @@
allocate(fEdgeNew(nEdgesNew))
allocate(fVertexNew(nVerticesNew))
-allocate(h_sNew(nCellsNew))
-allocate(u_srcNew(nVertLevelsNew,nEdgesNew))
-allocate(uNew(1,nVertLevelsNew,nEdgesNew))
-allocate(vNew(1,nVertLevelsNew,nEdgesNew))
allocate(hNew(1,nVertLevelsNew,nCellsNew))
-allocate(rhoNew(1,nVertLevelsNew,nCellsNew))
-allocate(temperatureNew(1,nVertLevelsNew,nCellsNew))
-allocate(salinityNew(1,nVertLevelsNew,nCellsNew))
-allocate(tracer1New(1,nVertLevelsNew,nCellsNew))
-! ice sheet variables
-!allocate(thckNew(1,nVertLevelsNew,nCellsNew))
-!allocate(topgNew(1,nVertLevelsNew,nCellsNew))
-
-allocate(temperatureRestoreNew(nCellsNew))
-allocate(salinityRestoreNew(nCellsNew))
-
xCellNew=0; yCellNew=0; zCellNew=0; latCellNew=0; lonCellNew=0
xEdgeNew=0; yEdgeNew=0; zEdgeNew=0; latEdgeNew=0; lonEdgeNew=0
xVertexNew=0; yVertexNew=0; zVertexNew=0; latVertexNew=0; lonVertexNew=0
-fEdgeNew=0; fVertexNew=0; h_sNew=0; u_srcNew=0
-uNew=0; vNew=0; hNew=0; rhoNew=0
-temperatureNew=0; salinityNew=0; tracer1New=0;
+hNew=0
-!thckNew = 0; topgNew = 0;
-
-temperatureRestoreNew = 0.0
-salinityRestoreNew = 0.0
-
-
do i=1,nCells
jNew = cellMap(i)
if(jNew.ne.0) then
Modified: branches/land_ice/icesheet/src/module_read_netcdf.F
===================================================================
--- branches/land_ice/icesheet/src/module_read_netcdf.F 2011-08-31 19:49:07 UTC (rev 970)
+++ branches/land_ice/icesheet/src/module_read_netcdf.F 2011-08-31 20:39:29 UTC (rev 971)
@@ -47,10 +47,6 @@
integer :: rdVarIDkiteAreasOnVertex
integer :: rdVarIDfEdge
integer :: rdVarIDfVertex
- integer :: rdVarIDh_s
- integer :: rdVarIDu
- integer :: rdVarIDv
- integer :: rdVarIDh
integer :: rdLocalnCells
integer :: rdLocalnEdges
@@ -163,10 +159,6 @@
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)
end subroutine read_netcdf_init
@@ -209,11 +201,7 @@
cellsOnVertex, &
kiteAreasOnVertex, &
fEdge, &
- fVertex, &
- h_s, &
- u, &
- v, &
- h &
+ fVertex &
)
implicit none
@@ -258,10 +246,6 @@
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
integer :: nferr
integer, dimension(1) :: start1, count1
@@ -463,29 +447,6 @@
count1( 1) = rdLocalnVertices
nferr = nf_get_vara_double(rd_ncid, rdVarIDfVertex, start1, count1, fVertex)
- start1(1) = 1
- count1( 1) = rdLocalnCells
- count1( 1) = rdLocalnCells
- nferr = nf_get_vara_double(rd_ncid, rdVarIDh_s, start1, count1, h_s)
-
- start3(3) = time
- count3( 1) = rdLocalnVertLevels
- count3( 2) = rdLocalnEdges
- count3( 3) = 1
- nferr = nf_get_vara_double(rd_ncid, rdVarIDu, start3, count3, u)
-
- start3(3) = time
- count3( 1) = rdLocalnVertLevels
- count3( 2) = rdLocalnEdges
- count3( 3) = 1
- nferr = nf_get_vara_double(rd_ncid, rdVarIDv, start3, count3, v)
-
- start3(3) = time
- count3( 1) = rdLocalnVertLevels
- count3( 2) = rdLocalnCells
- count3( 3) = 1
- nferr = nf_get_vara_double(rd_ncid, rdVarIDh, start3, count3, h)
-
end subroutine read_netcdf_fields
Modified: branches/land_ice/icesheet/src/module_write_netcdf.F
===================================================================
--- branches/land_ice/icesheet/src/module_write_netcdf.F 2011-08-31 19:49:07 UTC (rev 970)
+++ branches/land_ice/icesheet/src/module_write_netcdf.F 2011-08-31 20:39:29 UTC (rev 971)
@@ -48,19 +48,10 @@
integer :: wrVarIDkiteAreasOnVertex
integer :: wrVarIDfEdge
integer :: wrVarIDfVertex
-! integer :: wrVarIDh_s
-! integer :: wrVarIDu
integer :: wrVarIDboundaryEdge
integer :: wrVarIDboundaryVertex
-! integer :: wrVarIDu_src
-! integer :: wrVarIDv
+
integer :: wrVarIDh
-! integer :: wrVarIDrho
-! integer :: wrVarIDtemperature
-! integer :: wrVarIDsalinity
-! integer :: wrVarIDtracer1
-! integer :: wrVarIDtemperatureRestore
-! integer :: wrVarIDsalinityRestore
! ice sheet variables
integer :: wrVarIDthck
@@ -216,49 +207,17 @@
dimlist( 1) = wrDimIDnVertices
nferr = nf_def_var(wr_ncid, 'fVertex', NF_DOUBLE, 1, dimlist, wrVarIDfVertex)
dimlist( 1) = wrDimIDnCells
-! nferr = nf_def_var(wr_ncid, 'h_s', NF_DOUBLE, 1, dimlist, wrVarIDh_s)
-! dimlist( 1) = wrDimIDnCells
-! nferr = nf_def_var(wr_ncid, 'temperatureRestore', NF_DOUBLE, 1, dimlist, wrVarIDtemperatureRestore)
-! dimlist( 1) = wrDimIDnCells
-! nferr = nf_def_var(wr_ncid, 'salinityRestore', NF_DOUBLE, 1, dimlist, wrVarIDsalinityRestore)
-! dimlist( 1) = wrDimIDnVertLevels
-! dimlist( 2) = wrDimIDnEdges
-! dimlist( 3) = wrDimIDTime
-! nferr = nf_def_var(wr_ncid, 'u', NF_DOUBLE, 3, dimlist, wrVarIDu)
-! dimlist( 1) = wrDimIDnVertLevels
-! dimlist( 2) = wrDimIDnEdges
nferr = nf_def_var(wr_ncid, 'boundaryEdge', NF_INT, 2, dimlist, wrVarIDboundaryEdge)
dimlist( 1) = wrDimIDnVertLevels
dimlist( 2) = wrDimIDnVertices
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)
-! dimlist( 1) = wrDimIDnVertLevels
-! dimlist( 2) = wrDimIDnEdges
-! dimlist( 3) = wrDimIDTime
-! nferr = nf_def_var(wr_ncid, 'v', NF_DOUBLE, 3, dimlist, wrVarIDv)
-! dimlist( 1) = wrDimIDnVertLevels
-! dimlist( 2) = wrDimIDnCells
-! dimlist( 3) = wrDimIDTime
+
nferr = nf_def_var(wr_ncid, 'h', NF_DOUBLE, 3, dimlist, wrVarIDh)
dimlist( 1) = wrDimIDnVertLevels
dimlist( 2) = wrDimIDnCells
dimlist( 3) = wrDimIDTime
-! nferr = nf_def_var(wr_ncid, 'rho', NF_DOUBLE, 3, dimlist, wrVarIDrho)
-! dimlist( 1) = wrDimIDnVertLevels
-! dimlist( 2) = wrDimIDnCells
-! dimlist( 3) = wrDimIDTime
-! nferr = nf_def_var(wr_ncid, 'temperature', NF_DOUBLE, 3, dimlist, wrVarIDtemperature)
-! dimlist( 1) = wrDimIDnVertLevels
-! dimlist( 2) = wrDimIDnCells
-! dimlist( 3) = wrDimIDTime
-! nferr = nf_def_var(wr_ncid, 'salinity', NF_DOUBLE, 3, dimlist, wrVarIDsalinity)
-! dimlist( 1) = wrDimIDnVertLevels
-! dimlist( 2) = wrDimIDnCells
-! dimlist( 3) = wrDimIDTime
-! ! If you do not want tracer1 in your input file, simply comment out these two lines (one of two)
-! nferr = nf_def_var(wr_ncid, 'tracer1', NF_DOUBLE, 3, dimlist, wrVarIDtracer1)
! ice sheet variables (NOTE: for now, we are assuming vert dim of 1, so this works). If nVertLevels > 1, this dimensioning
! won't work, since thickness and topography are only 2d fields)
@@ -319,21 +278,11 @@
kiteAreasOnVertex, &
fEdge, &
fVertex, &
-! h_s, &
boundaryEdge, &
boundaryVertex, &
-! u_src, &
-! u, &
-! v, &
h, &
-! rho, &
-! temperature, &
-! salinity, &
-! tracer1, &
-! temperatureRestore, &
-! salinityRestore, &
- thck, &
- topg &
+ topg, &
+ thck &
)
implicit none
@@ -379,19 +328,10 @@
real (kind=8), dimension(:,:), intent(in) :: kiteAreasOnVertex
real (kind=8), dimension(:), intent(in) :: fEdge
real (kind=8), dimension(:), intent(in) :: fVertex
-! real (kind=8), dimension(:), intent(in) :: h_s
integer, dimension(:,:), intent(in) :: boundaryEdge
integer, dimension(:,:), intent(in) :: boundaryVertex
-! real (kind=8), dimension(:,:), intent(in) :: u_src
-! real (kind=8), dimension(:,:,:), intent(in) :: u
-! real (kind=8), dimension(:,:,:), intent(in) :: v
+
real (kind=8), dimension(:,:,:), intent(in) :: h
-! real (kind=8), dimension(:,:,:), intent(in) :: rho
-! real (kind=8), dimension(:,:,:), intent(in) :: temperature
-! real (kind=8), dimension(:,:,:), intent(in) :: salinity
-! real (kind=8), dimension(:,:,:), intent(in) :: tracer1
-! real (kind=8), dimension(:), intent(in) :: temperatureRestore
-! real (kind=8), dimension(:), intent(in) :: salinityRestore
! ice sheet fields
real (kind=8), dimension(:,:,:), intent(in) :: thck
@@ -579,10 +519,6 @@
count1( 1) = wrLocalnVertices
nferr = nf_put_vara_double(wr_ncid, wrVarIDfVertex, start1, count1, fVertex)
-! start1(1) = 1
-! count1( 1) = wrLocalnCells
-! nferr = nf_put_vara_double(wr_ncid, wrVarIDh_s, start1, count1, h_s)
-
start2(2) = 1
count2( 1) = wrLocalnVertLevels
count2( 2) = wrLocalnEdges
@@ -593,62 +529,12 @@
count2( 2) = wrLocalnVertices
nferr = nf_put_vara_int(wr_ncid, wrVarIDboundaryVertex, start2, count2, boundaryVertex)
-! start2(2) = 1
-! count2( 1) = wrLocalnVertLevels
-! count2( 2) = wrLocalnEdges
-! nferr = nf_put_vara_double(wr_ncid, wrVarIDu_src, start2, count2, u_src)
-
-! start1(1) = 1
-! count1( 1) = wrLocalnCells
-! nferr = nf_put_vara_double(wr_ncid, wrVarIDtemperatureRestore, start1, count1, temperatureRestore)
-
-! start1(1) = 1
-! count1( 1) = wrLocalnCells
-! nferr = nf_put_vara_double(wr_ncid, wrVarIDsalinityRestore, start1, count1, salinityRestore)
-
-! start3(3) = time
-! count3( 1) = wrLocalnVertLevels
-! count3( 2) = wrLocalnEdges
-! count3( 3) = 1
-! nferr = nf_put_vara_double(wr_ncid, wrVarIDu, start3, count3, u)
-
-! start3(3) = time
-! count3( 1) = wrLocalnVertLevels
-! count3( 2) = wrLocalnEdges
-! count3( 3) = 1
-! nferr = nf_put_vara_double(wr_ncid, wrVarIDv, start3, count3, v)
-
start3(3) = time
count3( 1) = wrLocalnVertLevels
count3( 2) = wrLocalnCells
count3( 3) = 1
nferr = nf_put_vara_double(wr_ncid, wrVarIDh, 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)
-
-! start3(3) = time
-! count3( 1) = wrLocalnVertLevels
-! count3( 2) = wrLocalnCells
-! count3( 3) = 1
-! nferr = nf_put_vara_double(wr_ncid, wrVarIDtemperature, start3, count3, temperature)
-
-! start3(3) = time
-! count3( 1) = wrLocalnVertLevels
-! count3( 2) = wrLocalnCells
-! count3( 3) = 1
-! nferr = nf_put_vara_double(wr_ncid, wrVarIDsalinity, start3, count3, salinity)
-
-! start3(3) = time
-! count3( 1) = wrLocalnVertLevels
-! count3( 2) = wrLocalnCells
-! count3( 3) = 1
-! ! If you do not want tracer1 in your input file, simply comment out these two lines (two of two)
-! nferr = nf_put_vara_double(wr_ncid, wrVarIDtracer1, start3, count3, tracer1)
-
! ice sheet fields
start3(3) = time
count3( 1) = wrLocalnVertLevels
</font>
</pre>