New URL for NEMO forge! http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.

Changeset 6425 – NEMO

Context Navigation

← Previous Changeset
Next Changeset →

Changeset 6425

Timestamp:

2016-04-05T11:36:35+02:00 (8 years ago)

Author:

timgraham

Message:

Remove leftover ">>>>>working" line accidentally left from merge.

File:

: 1 edited

branches/2015/dev_r5803_UKMO_AGRIF_Vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2015/dev_r5803_UKMO_AGRIF_Vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

r6404	r6425
1147	1147	! VERTICAL REFINEMENT END
1148	1148	zrhox= Agrif_Rhox()
1149		~~<<<<<<< .working~~
1150	1149	DO jk=1,jpkm1
1151	1150	DO jj=j1,j2

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: