Changeset 2239
- Timestamp:
- 2010-10-13T00:03:11+02:00 (14 years ago)
- Location:
- branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/ASM/asminc.F90
r2218 r2239 47 47 & ub, un, ua, & 48 48 & vb, vn, va, & 49 & tb, tn, ta, & 50 & sb, sn, sa, & 49 & tsb, tsn, tsa, & 51 50 & sshb, sshn, & 52 51 & rhd, rhop, & 53 52 & rotb, rotn, & 54 53 & hdivb, hdivn, & 55 & gt u, gsu, gru,&56 & gt v, gsv, grv54 & gtsu, gru, & 55 & gtsv, grv 57 56 USE divcur, ONLY : & ! Horizontal divergence and relative vorticity 58 57 & div_cur … … 724 723 ! Update the tracer tendencies 725 724 DO jk = 1, jpkm1 726 t a(:,:,jk) = ta(:,:,jk) + t_bkginc(:,:,jk) * zincwgt727 sa(:,:,jk) = sa(:,:,jk) + s_bkginc(:,:,jk) * zincwgt725 tsa(:,:,jk,jp_tem) = tsa(:,:,jk,jp_tem) + t_bkginc(:,:,jk) * zincwgt 726 tsa(:,:,jk,jp_sal) = tsa(:,:,jk,jp_sal) + s_bkginc(:,:,jk) * zincwgt 728 727 END DO 729 728 … … 733 732 DO jj = 1, jpj 734 733 DO ji= 1, jpi 735 sa(ji,jj,jk) = MAX( sa(ji,jj,jk), salfixmin )734 tsa(ji,jj,jk,jp_sal) = MAX( tsa(ji,jj,jk,jp_sal), salfixmin ) 736 735 END DO 737 736 END DO … … 758 757 759 758 ! Initialize the now fields with the background + increment 760 t n(:,:,:) = t_bkg(:,:,:) + t_bkginc(:,:,:)761 sn(:,:,:) = s_bkg(:,:,:) + s_bkginc(:,:,:)759 tsn(:,:,:,jp_tem) = t_bkg(:,:,:) + t_bkginc(:,:,:) 760 tsn(:,:,:,jp_sal) = s_bkg(:,:,:) + s_bkginc(:,:,:) 762 761 763 762 ! Optional salinity fix … … 766 765 DO jj = 1, jpj 767 766 DO ji= 1, jpi 768 sn(ji,jj,jk) = MAX( sn(ji,jj,jk), salfixmin )767 tsn(ji,jj,jk,jp_sal) = MAX( tsn(ji,jj,jk,jp_sal), salfixmin ) 769 768 END DO 770 769 END DO … … 772 771 ENDIF 773 772 774 tb(:,:,:) = tn(:,:,:) ! Update before fields 775 sb(:,:,:) = sn(:,:,:) 776 777 CALL eos( tb, sb, rhd, rhop ) ! Before potential and in situ densities 773 tsb(:,:,:,:) = tsn(:,:,:,:) ! Update before fields 774 775 CALL eos( tsb, rhd, rhop ) ! Before potential and in situ densities 778 776 779 777 #if ! defined key_c1d 780 778 IF( ln_zps ) & 781 & CALL zps_hde( nit000, tb, sb, rhd,& ! Partial steps: before horizontal derivative782 & gt u, gsu, gru, & ! of T, S, rd at the bottom ocean level783 & g tv, gsv, grv )779 & CALL zps_hde( nit000, jpts, tsb, & ! Partial steps: before horizontal derivative 780 & gtsu, gtsv, rhd, & ! of T, S, rd at the bottom ocean level 781 & gru , grv ) 784 782 #endif 785 783 -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/ASM/asmtrj.F90
r2128 r2239 224 224 #if defined key_ldfslp 225 225 IF(lwp) WRITE(numout,*) ' Compute the slopes of neutral surface...' 226 CALL bn2( t b,sb, rn2 )226 CALL bn2( tsb, rn2 ) 227 227 CALL ldf_slp( nit000, rhd, rn2 ) 228 228 #endif … … 280 280 281 281 END MODULE asmtrj 282 283 -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/dom_oce.F90
r2236 r2239 232 232 LOGICAL, PUBLIC, PARAMETER :: lk_agrif = .FALSE. !: agrif flag 233 233 234 !!----------------------------------------------------------------------235 !! mpp reproducibility236 !!----------------------------------------------------------------------237 #if defined key_mpp_rep1 || defined key_mpp_re2238 LOGICAL, PUBLIC, PARAMETER :: lk_mpp_rep = .TRUE. !: agrif flag239 #else240 LOGICAL, PUBLIC, PARAMETER :: lk_mpp_rep = .FALSE. !: agrif flag241 #endif242 243 234 CONTAINS 244 235 LOGICAL FUNCTION Agrif_Root() -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/LDF/ldfslp.F90
r2236 r2239 532 532 ikv = MIN( mbathy(ji,jj), mbathy(ji ,jj+1) ) - 1 533 533 ! i-gradient of T and S 534 zdit (ji,jj,iku) = gt u(ji,jj)535 zdis (ji,jj,iku) = g su(ji,jj)534 zdit (ji,jj,iku) = gtsu(ji,jj,jp_tem) 535 zdis (ji,jj,iku) = gtsu(ji,jj,jp_sal) 536 536 ! j-gradient of T and S 537 zdjt (ji,jj,ikv) = gt v(ji,jj)538 zdjs (ji,jj,ikv) = g sv(ji,jj)537 zdjt (ji,jj,ikv) = gtsv(ji,jj,jp_tem) 538 zdjs (ji,jj,ikv) = gtsv(ji,jj,jp_sal) 539 539 # if ! defined key_vectopt_loop || defined key_mpp_omp 540 540 END DO -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/SBC/fldread.F90
r2236 r2239 681 681 ! build the new filename if climatological data 682 682 IF( sdjf%cltype == 'monthly' ) WRITE(sdjf%clname, '(a,"_m" ,i2.2)' ) TRIM( sdjf%clrootname ), kmonth ! add month 683 ELSE684 ! build the new filename if climatological data685 IF( sdjf%cltype == 'monthly' ) WRITE(sdjf%clname, '(a,"_m",i2.2)' ) TRIM( sdjf%clrootname ), kmonth ! add month686 683 ENDIF 687 684 CALL iom_open( sdjf%clname, sdjf%num, ldstop = ldstop, ldiof = LEN(TRIM(sdjf%wgtname)) > 0 ) -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90
r2236 r2239 52 52 53 53 PUBLIC sbc_ice_lim_2 ! routine called by sbcmod.F90 54 55 CHARACTER(len=1) :: cl_grid = 'B' ! type of grid used in ice dynamics 54 56 55 57 !! * Substitutions … … 170 172 ! Ice model step ! 171 173 ! ---------------- ! 172 numit = numit + nn_fsbc ! Ice model time step173 174 174 CALL lim_rst_opn_2 ( kt ) ! Open Ice restart file 175 175 #if ! defined key_c1d -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/SBC/sbcrnf.F90
r2236 r2239 199 199 !!---------------------------------------------------------------------- 200 200 CHARACTER(len=32) :: rn_dep_file ! runoff file name 201 INTEGER :: inum ! temporary integers202 INTEGER :: ierror 201 INTEGER :: ji, jj, jk ! dummy loop indices 202 INTEGER :: ierror, inum ! temporary integer 203 203 !! 204 204 NAMELIST/namsbc_rnf/ cn_dir, ln_rnf_emp, ln_rnf_depth, ln_rnf_temp, ln_rnf_sal, & -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/TRA/tradmp.F90
r2236 r2239 96 96 REAL(wp) :: zta, zsa ! temporary scalars 97 97 INTEGER :: ji, jj, jk ! dummy loop indices 98 REAL(wp) :: zta, zsa99 98 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: ztrdt, ztrds 100 99 !!---------------------------------------------------------------------- -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/TRA/trasbc.F90
r2236 r2239 108 108 !! 109 109 INTEGER :: ji, jj, jk ! dummy loop indices 110 REAL(wp) :: zfact, z1_e3t !110 REAL(wp) :: zfact, z1_e3t, zsrau,zdep 111 111 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: ztrdt, ztrds 112 112 !!---------------------------------------------------------------------- -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/step.F90
r2236 r2239 33 33 #endif 34 34 35 USE zdfgls ! generic length scale case 35 36 USE asminc ! assimilation increments (tra_asm_inc, dyn_asm_inc routines) 36 37 USE stpctl ! time stepping control (stp_ctl routine) -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/step_oce.F90
r2148 r2239 95 95 USE traswp ! Swap arrays (tra_swp, tra_unswp routine) 96 96 97 USE diaobs ! Observation operator 98 97 99 #if defined key_agrif 98 100 USE agrif_opa_sponge ! Momemtum and tracers sponges
Note: See TracChangeset
for help on using the changeset viewer.