Changeset 5952 for branches/NERC/dev_r5589_is_oce_cpl
- Timestamp:
- 2015-11-30T13:16:21+01:00 (8 years ago)
- Location:
- branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OFF_SRC/domrea.F90
r5779 r5952 123 123 & nn_it000, nn_itend , nn_date0 , nn_leapy , nn_istate , nn_stock , & 124 124 & nn_write, ln_iscpl, ln_dimgnnn, ln_mskland , ln_cfmeta , ln_clobber, nn_chunksz, nn_euler 125 NAMELIST/namdom/ nn_bathy , rn_bathy, rn_e3zps_min, rn_e3zps_rat, nn_msh , rn_hmin, &125 NAMELIST/namdom/ nn_bathy , rn_bathy, rn_e3zps_min, rn_e3zps_rat, nn_msh , rn_hmin, rn_isfhmin, & 126 126 & nn_acc , rn_atfp , rn_rdt , rn_rdtmin , & 127 127 & rn_rdtmax, rn_rdth , nn_baro , nn_closea , ln_crs, & -
branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
r5945 r5952 1272 1272 mbathy(:,:) = INT( zbathy(:,:) ) 1273 1273 ENDIF 1274 ! JMM : lbc_lnk must do it ? no ???1275 1274 IF( nperio == 1 .OR. nperio == 4 .OR. nperio == 6 ) THEN 1276 1275 misfdep( 1 ,:) = misfdep(jpim1,:) ! local domain is cyclic east-west -
branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90
r5945 r5952 30 30 31 31 PUBLIC iscpl_stp ! step management 32 PUBLIC iscpl_rst_interpol ! routine to wet and dry ! JMM: why PUBLIC, it is only called33 ! from this module from iscpl_stp, called from istate ??34 32 !! 35 33 !! * Substitutions … … 398 396 zdzm1 = MAX(0._wp,pdepw_b(ji,jj,jk ) - fsdepw_n(ji,jj,jk )) 399 397 IF (zdz .LT. 0._wp) THEN 400 !!!!JMM : numout must not be used without IF (lwp)401 IF ( lwp ) THEN402 WRITE(numout,*) 'ERROR dz n ', ji,jj,jk,zdz,fsdepw_n(ji,jj,jk+1),fsdepw_n(ji,jj,jk),fsdepw_n(ji,jj,jk-1)403 WRITE(numout,*) 'ERROR dz n = ',fse3t_n (ji,jj,jk+1),fse3t_n (ji,jj,jk),fse3t_n (ji,jj,jk-1), sshn(ji,jj)404 WRITE(numout,*) 'ERROR dz b = ',pdepw_b(ji,jj,jk+1),pdepw_b(ji,jj,jk),pdepw_b(ji,jj,jk-1)405 WRITE(numout,*) 'ERROR dz b = ',fse3t_b (ji,jj,jk+1),fse3t_b (ji,jj,jk),fse3t_b (ji,jj,jk-1), sshb(ji,jj)406 WRITE(numout,*) 'ERROR dz 0 = ', e3t_0 (ji,jj,jk+1), e3t_0 (ji,jj,jk), e3t_0 (ji,jj,jk-1)407 WRITE(numout,*) 'ERROR dz n = ', tmask (ji,jj,jk+1), tmask (ji,jj,jk), tmask (ji,jj,jk-1)408 WRITE(numout,*) 'ERROR dz n = ', zwmaskn(ji,jj,jk+1), zwmaskn(ji,jj,jk), zwmaskn(ji,jj,jk-1)409 WRITE(numout,*) 'ERROR dz b = ', ptmask_b(ji,jj,jk+1), ptmask_b(ji,jj,jk), ptmask_b(ji,jj,jk-1)410 WRITE(numout,*) 'ERROR dz b = ', zwmaskb(ji,jj,jk+1), zwmaskb(ji,jj,jk), zwmaskb(ji,jj,jk-1)411 WRITE(numout,*) 'ERROR dz b = ', gdepw_0(ji,jj,jk+1), gdepw_0(ji,jj,jk), gdepw_0(ji,jj,jk-1)412 ENDIF413 398 CALL ctl_stop( 'STOP', 'rst_iscpl : unable to compute the interpolation' ) 414 399 END IF -
branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90
r5779 r5952 358 358 IF ( nn_timing == 1 ) CALL timing_start('sbc_isf_bg03') 359 359 ! 360 361 ! This test is false only in the very first time step of a run (JMM ???- Initialy build to skip 1rst year of run )362 360 DO ji = 1, jpi 363 361 DO jj = 1, jpj … … 368 366 ! 3. -----------the average temperature between 200m and 600m --------------------- 369 367 DO jk = misfkt(ji,jj),misfkb(ji,jj) 370 ! freezing point temperature at ice shelf base BG eq. 2 (JMM sign pb ??? +7.64e-4 !!!)371 ! after verif with UNESCO, wrong sign in BG eq. 2372 368 ! Calculate freezing temperature 373 zpress = grav*rau0*fsdept(ji,jj,ik)*1.e-04 374 CALL eos_fzp(tsb(ji,jj,ik,jp_sal), zt_frz, zpress) 369 CALL eos_fzp(tsb(ji,jj,ik,jp_sal), zt_frz, fsdept(ji,jj,ik)) 375 370 zt_sum = zt_sum + (tsn(ji,jj,ik,jp_tem)-zt_frz) * fse3t(ji,jj,ik) * tmask(ji,jj,ik) ! sum temp 376 371 ENDDO
Note: See TracChangeset
for help on using the changeset viewer.