Skip to content

Commit 2ef2de4

Browse files
author
simon
committed
mode=0 working version; need to test mode=3
1 parent 1e3887b commit 2ef2de4

File tree

9 files changed

+425
-541
lines changed

9 files changed

+425
-541
lines changed

makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@ CLEAN = rm
1414
NETCDFINC = -I/aracbox/lib/netcdf/4.1.2/intel_12/include
1515
NETCDFLIB = -L/aracbox/lib/netcdf/4.1.2/intel_12/lib
1616

17-
#FFLAGS = -check bounds -warn interface -g -traceback -fpe0 -mcmodel large -shared-intel -fp-model precise -align commons $(NETCDFINC)
18-
#FFLAGS = -O3 -mcmodel large -shared-intel -fp-model precise -align commons $(NETCDFINC)
1917
#FFLAGS = -O3 -mcmodel large -shared-intel -fp-model precise -assume byterecl $(NETCDFINC)
2018
FFLAGS = -check bounds -warn interface -g -traceback -mcmodel large -shared-intel -fp-model precise -assume byterecl $(NETCDFINC)
2119

22-
#LIBS = -check bounds -warn interface -g -traceback -fpe0 -mcmodel large -shared-intel -fp-model precise -align commons $(NETCDFLIB) -lnetcdf -lnetcdff -limf -lm
23-
#LIBS = -O3 -mcmodel large -shared-intel -fp-model precise -align commons $(NETCDFLIB) -lnetcdf -lnetcdff -limf -lm
2420
#LIBS = -O3 -mcmodel large -shared-intel -fp-model precise -assume byterecl $(NETCDFLIB) -lnetcdf -lnetcdff -limf -lm
2521
LIBS = -check bounds -warn interface -g -traceback -mcmodel large -shared-intel -fp-model precise -assume byterecl $(NETCDFLIB) -lnetcdf -lnetcdff -limf -lm
2622
#-----------------------------------------------------------------------
@@ -39,6 +35,7 @@ SRCDIR = pom
3935
#-----------------------------------------------------------------------
4036
OBJS = pom08_iosub.o \
4137
module_time.o \
38+
interp.o \
4239
gridgen.o \
4340
wave.o \
4441
wind.o \
@@ -74,4 +71,4 @@ $(BIN): $(OBJS)
7471
# Cleaning target
7572
#-----------------------------------------------------------------------
7673
clean:
77-
@rm -f *.o *.mod *.il *.exe
74+
@rm -f *.o *.mod *.il *.exe *genmod.f90

pom/gridgen.f

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ subroutine gridgen
109109
c h(1,j)=h(2,j)
110110
c h(im,j)=h(im-1,j)
111111
c enddo
112-
c call areas_masks ! obtain fsm,dum,dvm
112+
call areas_masks ! obtain fsm,dum,dvm
113113
C
114114
C Adjust bottom topography so that cell to cell variations
115115
C in h do not exceed parameter slmax:
@@ -159,7 +159,7 @@ subroutine gridgen
159159
C Set initial conditions:
160160
C
161161
c!sc:vel is used for ub
162-
vel=0.2e0 ! current velocity
162+
vel=0.1e0 ! current velocity
163163
164164
do k=1,kbm1
165165
!sc:add dz and dzz calculation
@@ -171,7 +171,7 @@ subroutine gridgen
171171
sb(i,j,k)=35.e0-sbias
172172
tclim(i,j,k)=tb(i,j,k)
173173
sclim(i,j,k)=sb(i,j,k)
174-
! ub(i,j,k)=vel*dum(i,j)
174+
ub(i,j,k)=vel*dum(i,j)
175175
end do
176176
end do
177177
end do
@@ -187,7 +187,7 @@ subroutine gridgen
187187
C
188188
do j=1,jm
189189
do i=1,im
190-
! uab(i,j)=vel*dum(i,j)
190+
uab(i,j)=vel*dum(i,j)
191191
end do
192192
end do
193193
C

0 commit comments

Comments
 (0)