Changeset 7145
- Timestamp:
- 2016-10-27T16:48:33+02:00 (8 years ago)
- Location:
- branches/UKMO/r5518_amm15_test/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/r5518_amm15_test/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90
r7144 r7145 184 184 ptsd(:,:,:,jp_sal) = sf_tsd(jp_sal)%fnow(:,:,:) 185 185 ! 186 IF( ln_sco ) THEN !== s- or mixed s-zps-coordinate ==!186 IF( ln_sco .AND. 1==0 ) THEN !== s- or mixed s-zps-coordinate ==! 187 187 ! 188 188 CALL wrk_alloc( jpk, ztp, zsp ) -
branches/UKMO/r5518_amm15_test/NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90
r4292 r7145 28 28 Wave(18) = tide( 'L2' , 0.006694 , 2 , 2 , -1 , 2 , -1 , 0 , +180 , 2 , -2 , 0 , 0 , 0 , 215 ) 29 29 Wave(19) = tide( 'T2' , 0.006614 , 2 , 2 , 0 , -1 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ) 30 ! 31 ! !! name_tide , equitide , nutide , nt , ns , nh , np , np1 , shift , nksi , nnu0 , nnu1 , nnu2 , R , formula !! 32 Wave(20) = tide( 'MNS2' , 0.000000 , 2 , 2 , -5 , 4 , 1 , 0 , 0 , 4 , -4 , 0 , 0 , 0 , 6 ) 33 Wave(21) = tide( 'Lam2' , 0.001760 , 2 , 2 , -1 , 0 , 1 , 0 , +180 , 2 , -2 , 0 , 0 , 0 , 78 ) 34 Wave(22) = tide( 'MSN2' , 0.000000 , 2 , 2 , 1 , 0 , 1 , 0 , 0 , 2 , -2 , 0 , 2 , 0 , 6 ) 35 Wave(23) = tide( '2SM2' , 0.000000 , 2 , 2 , 2 , -2 , 0 , 0 , 0 , -2 , 2 , 0 , 0 , 0 , 16 ) 36 Wave(24) = tide( 'MO3' , 0.000000 , 3 , 3 , -4 , 1 , 0 , 0 , +90 , 2 , -2 , 0 , 0 , 0 , 13 ) 37 Wave(25) = tide( 'MK3' , 0.000000 , 3 , 3 , -2 , 3 , 0 , 0 , -90 , 2 , -2 , -1 , 0 , 0 , 10 ) 38 Wave(26) = tide( 'MN4' , 0.000000 , 4 , 4 , -5 , 4 , 1 , 0 , 0 , 4 , -4 , 0 , 0 , 0 , 1 ) 39 Wave(27) = tide( 'MS4' , 0.000000 , 4 , 4 , -2 , 2 , 0 , 0 , 0 , 2 , -2 , 0 , 0 , 0 , 2 ) 40 Wave(28) = tide( 'M6' , 0.000000 , 6 , 6 , -6 , 6 , 0 , 0 , 0 , 6 , -6 , 0 , 0 , 0 , 4 ) 41 Wave(29) = tide( '2MS6' , 0.000000 , 6 , 6 , -4 , 4 , 0 , 0 , 0 , 4 , -4 , 0 , 0 , 0 , 6 ) 42 Wave(30) = tide( '2MK6' , 0.000000 , 6 , 6 , -4 , 6 , 0 , 0 , 0 , 4 , -4 , 0 , -2 , 0 , 5 ) 43 Wave(31) = tide( '3M2S2' , 0.000000 , 2 , 2 , -6 , 6 , 0 , 0 , 0 , 6 , -6 , 0 , 0 , 0 , 12 ) -
branches/UKMO/r5518_amm15_test/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90
r7144 r7145 16 16 PUBLIC tide_init_Wave ! called by tideini and diaharm modules 17 17 18 INTEGER, PUBLIC, PARAMETER :: jpmax_harmo = 19!: maximum number of harmonic18 INTEGER, PUBLIC, PARAMETER :: jpmax_harmo = 31 !: maximum number of harmonic 19 19 20 20 TYPE, PUBLIC :: tide 21 CHARACTER(LEN= 4) :: cname_tide21 CHARACTER(LEN=5) :: cname_tide 22 22 REAL(wp) :: equitide 23 23 INTEGER :: nutide -
branches/UKMO/r5518_amm15_test/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90
r7144 r7145 47 47 INTEGER :: ji, jk 48 48 INTEGER, INTENT( in ) :: kt ! ocean time-step 49 CHARACTER(LEN= 4), DIMENSION(jpmax_harmo) :: clname49 CHARACTER(LEN=5), DIMENSION(jpmax_harmo) :: clname 50 50 INTEGER :: ios ! Local integer output status for namelist read 51 51 ! -
branches/UKMO/r5518_amm15_test/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90
r7144 r7145 91 91 INTEGER, INTENT(in) :: kt ! ocean time-step index 92 92 !! 93 INTEGER :: j k, jn ! dummy loop indices93 INTEGER :: ji, jj, jk, jn ! dummy loop indices 94 94 REAL(wp) :: zfact ! local scalars 95 95 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdt, ztrds … … 103 103 IF(lwp) WRITE(numout,*) '~~~~~~~' 104 104 ENDIF 105 106 ! JGraham: Update after tracer to remove any temp < -2C (no sea ice in AMM15). 107 DO jk = 1, jpk 108 DO jj = 1, jpj 109 DO ji = 1, jpi 110 IF(tsa(ji,jj,jk,jp_tem) < -2.e0) THEN 111 tsa(ji,jj,jk,jp_tem) = -2.e0 112 ENDIF 113 END DO 114 END DO 115 END DO 105 116 106 117 ! Update after tracer on domain lateral boundaries
Note: See TracChangeset
for help on using the changeset viewer.