Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

# Project and case definition

PROJECT = GLORYS12
CASE = Nordic5
PROJECT = GLORYS12_ORCA
CASE = Atlantic_gates_Lom_hf

RUNFILE = runtracmass
ARCH = nird
ARCH = cyclone

NETCDFLIBS = custom
NETCDFLIBS = automatic-44
NCDF_ROOT = ${HOME}/local/netcdf-fortran/4.5.3
#================================================================

Expand Down
6 changes: 3 additions & 3 deletions projects/GLORYS12_ORCA/Makefile.prj
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

# Vertical velocities
#------------------------------------------------------------------------
fl01 = -Dw_2dim # Turn off vertical velocities.
#fl01 = -Dw_3dim # Compute 3D vertical velocities.

#fl01 = -Dw_2dim # Turn off vertical velocities.
fl01 = -Dw_3dim # Compute 3D vertical velocities.
#fl01 = -Dw_explicit

# Time integration scheme
#------------------------------------------------------------------------
Expand Down
19 changes: 17 additions & 2 deletions projects/GLORYS12_ORCA/kill_zones.F90
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SUBROUTINE kill_zones

IMPLICIT NONE

INTEGER :: nexit, itrac, numexit
INTEGER :: nexit, itrac, numexit

nend = -1

Expand Down Expand Up @@ -79,7 +79,22 @@ SUBROUTINE kill_zones
! This must be hard coded below.

CASE(4)
PRINT*, 'Hard coded limits of the domain'
! This will now kill everything one index BELOW the section.
DO nexit = 1, SIZE(killi)
!IF (x1 == killi(nexit) .AND. &
! y1 >= killj(nexit) - 1 .AND. y1 <= killj(nexit)) THEN
! nend = nexit + 1
! EXIT
!ELSE IF (y1 == killj(nexit) .AND. x1 >= killi(nexit) - 1 .AND. &
! x1 <= killi(nexit)) THEN
! nend = nexit + 1
! EXIT
IF (x1 >= killi(nexit) - 1 .AND. x1 <= killi(nexit) .AND. &
y1 >= killj(nexit) - 1 .AND. y1 <= killj(nexit)) THEN
nend = nexit + 1
EXIT
END IF
END DO

END SELECT

Expand Down
Loading