Changeset 7520 for branches/2015
- Timestamp:
- 2016-12-28T17:26:05+01:00 (7 years ago)
- Location:
- branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90
r7332 r7520 708 708 !! Arguments 709 709 REAL(wp), DIMENSION(jpi,jpj), INTENT(in) :: p_fld ! T, U, V or W on parent grid 710 CHARACTER(len= 3), INTENT(in) :: cd_op ! Operation SUM, MAX or MIN710 CHARACTER(len=*), INTENT(in) :: cd_op ! Operation SUM, MAX or MIN 711 711 CHARACTER(len=1), INTENT(in) :: cd_type ! grid type U,V 712 712 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in) :: p_mask ! Parent grid T,U,V mask … … 729 729 p_fld_crs(:,:) = 0.0 730 730 731 SELECT CASE ( cd_op)731 SELECT CASE ( TRIM(cd_op) ) 732 732 733 733 CASE ( 'VOL' ) -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90
r7398 r7520 316 316 317 317 CALL crs_dom_ope( qsr , 'SUM', 'T', tmask, qsr_crs , p_e12=e1e2t, p_surf_crs=e1e2t_crs, psgn=1.0 ) 318 #if defined key_vvl 319 CALL crs_dom_ope( gdepw_n, 'MAX', 'W', tmask, gdepw_n_crs, p_e3=zfse3w, psgn=1.0 ) 320 #else 321 CALL crs_dom_ope( gdepw_0, 'MAX', 'W', tmask, gdepw_0_crs, p_e3=zfse3w, psgn=1.0 ) 322 #endif 318 323 319 CALL crs_dom_ope( emp ,'SUM', 'T', tmask, emp_crs , p_e12=e1e2t, p_surf_crs=e1e2t_crs, psgn=1.0 ) 324 320 CALL crs_dom_ope( fmmflx,'SUM', 'T', tmask, fmmflx_crs, p_e12=e1e2t, p_surf_crs=e1e2t_crs, psgn=1.0 ) 325 321 CALL crs_dom_ope( sfx ,'SUM', 'T', tmask, sfx_crs , p_e12=e1e2t, p_surf_crs=e1e2t_crs, psgn=1.0 ) 322 326 323 CALL crs_dom_ope( fr_i ,'SUM', 'T', tmask, fr_i_crs , p_e12=e1e2t, p_surf_crs=e1e2t_crs, psgn=1.0 ) 324 fr_i_crs=MAX( 0._wp, MIN( fr_i_crs , 1._wp ) ) 327 325 328 326 z2d=REAL(nmln,wp) -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90
r7256 r7520 15 15 !! surface boundary condition 16 16 !!---------------------------------------------------------------------- 17 USE oce ! ocean dynamics and tracers18 17 USE dom_oce ! ocean space and time domain 19 18 USE phycst ! ??? … … 24 23 USE wrk_nemo ! work arrays 25 24 USE lbclnk ! ocean lateral boundary conditions (C1D case) 26 USE ioipsl, ONLY :ymds2ju, ju2ymds ! for calendar27 USE sbc_oce 25 USE ioipsl, ONLY : ymds2ju, ju2ymds ! for calendar 26 USE sbc_oce, ONLY : nn_components,nn_lsm,jp_iam_sas 28 27 29 28 IMPLICIT NONE -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90
r7398 r7520 55 55 INTEGER :: ji, jj, jk, jn 56 56 CHARACTER (len=25) :: charout 57 58 57 !!--------------------------------------------------------------------- 59 58 ! … … 73 72 END DO 74 73 75 76 74 CALL p4z_opt ( kt, knt ) ! Optic: PAR in the water column 77 75 CALL p4z_sink ( kt, knt ) ! vertical flux of particulate organic matter … … 81 79 ! ! (for each element : C, Si, Fe, Chl ) 82 80 CALL p4z_mort ( kt ) ! phytoplankton mortality 83 ! ! zooplankton sources/sinks routines81 ! ! zooplankton sources/sinks routines 84 82 CALL p4z_micro( kt, knt ) ! microzooplankton 85 83 CALL p4z_meso ( kt, knt ) ! mesozooplankton -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90
r7398 r7520 107 107 ekg(ji,jj,jk) = xkrgb(2,irgb) * fse3t(ji,jj,jk) 108 108 ekr(ji,jj,jk) = xkrgb(3,irgb) * fse3t(ji,jj,jk) 109 !#if defined key_crs110 ! zfse3 = e3t_max_crs(ji,jj,jk)111 !#else112 ! zfse3 = fse3t(ji,jj,jk)113 !#endif114 ! ekb(ji,jj,jk) = xkrgb(1,irgb) * zfse3115 ! ekg(ji,jj,jk) = xkrgb(2,irgb) * zfse3116 ! ekr(ji,jj,jk) = xkrgb(3,irgb) * zfse3117 109 END DO 118 110 END DO … … 200 192 zetmp4 (ji,jj) = zetmp4 (ji,jj) + ediat (ji,jj,jk) * fse3t(ji,jj,jk) ! production 201 193 zdepmoy(ji,jj) = zdepmoy(ji,jj) + fse3t(ji,jj,jk) 202 !#if defined key_crs203 ! zfse3 = e3t_max_crs(ji,jj,jk)204 !#else205 ! zfse3 = fse3t(ji,jj,jk)206 !#endif207 ! zetmp1 (ji,jj) = zetmp1 (ji,jj) + etot (ji,jj,jk) * zfse3 ! remineralisation208 ! zetmp2 (ji,jj) = zetmp2 (ji,jj) + etot_ndcy(ji,jj,jk) * zfse3 ! production209 ! zetmp3 (ji,jj) = zetmp3 (ji,jj) + enano (ji,jj,jk) * zfse3 ! production210 ! zetmp4 (ji,jj) = zetmp4 (ji,jj) + ediat (ji,jj,jk) * zfse3 ! production211 ! zdepmoy(ji,jj) = zdepmoy(ji,jj) + zfse3212 194 ENDIF 213 195 END DO -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90
r7398 r7520 223 223 DO ji = 1, jpi 224 224 ikt = mbkt(ji,jj) 225 !#if defined key_crs 226 ! zdep = e3t_max_crs(ji,jj,ikt) / xstep 227 !#else 228 ! zdep = fse3t(ji,jj,ikt) / xstep 229 !#endif 225 #if defined key_crs 226 zdep = e3t_max_crs(ji,jj,ikt) / xstep 227 #else 230 228 zdep = fse3t(ji,jj,ikt) / xstep 229 #endif 231 230 zwsbio4(ji,jj) = MIN( 0.99 * zdep, wsbio4(ji,jj,ikt) ) 232 231 zwscal (ji,jj) = MIN( 0.99 * zdep, wscal (ji,jj,ikt) ) -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90
r7398 r7520 135 135 DO ji = 1, jpi 136 136 IF( tmask(ji,jj,jk) == 1) THEN 137 !#if defined key_crs 138 ! zwsmax = 0.5 * e3t_max_crs(ji,jj,jk) / xstep 139 !#else 140 ! zwsmax = 0.5 * fse3t(ji,jj,jk) / xstep 141 !#endif 137 #if defined key_crs 138 zwsmax = 0.5 * e3t_max_crs(ji,jj,jk) / xstep 139 #else 142 140 zwsmax = 0.5 * fse3t(ji,jj,jk) / xstep 141 #endif 143 142 iiter1 = MAX( iiter1, INT( wsbio3(ji,jj,jk) / zwsmax ) ) 144 143 iiter2 = MAX( iiter2, INT( wsbio4(ji,jj,jk) / zwsmax ) ) … … 159 158 DO ji = 1, jpi 160 159 IF( tmask(ji,jj,jk) == 1 ) THEN 161 !#if defined key_crs 162 ! zwsmax = 0.5 * e3t_max_crs(ji,jj,jk) / xstep 163 !#else 164 ! zwsmax = 0.5 * fse3t(ji,jj,jk) / xstep 165 !#endif 166 zwsmax = 0.5 * fse3t(ji,jj,jk) / xstep 160 zwsmax = 0.5 * fse3t(ji,jj,jk) / xstep 167 161 wsbio3(ji,jj,jk) = MIN( wsbio3(ji,jj,jk), zwsmax * FLOAT( iiter1 ) ) 168 162 wsbio4(ji,jj,jk) = MIN( wsbio4(ji,jj,jk), zwsmax * FLOAT( iiter2 ) ) … … 870 864 DO jj = 1,jpj 871 865 DO ji = 1, jpi 866 #if defined key_crs 867 zflx = ( psinkflx(ji,jj,jk) - psinkflx(ji,jj,jk+1) ) / e3t_max_crs(ji,jj,jk) 868 #else 872 869 zflx = ( psinkflx(ji,jj,jk) - psinkflx(ji,jj,jk+1) ) / fse3t(ji,jj,jk) 870 #endif 873 871 trb(ji,jj,jk,jp_tra) = trb(ji,jj,jk,jp_tra) + zflx 874 872 END DO … … 881 879 DO jj = 1,jpj 882 880 DO ji = 1, jpi 881 #if defined key_crs 882 zflx = ( psinkflx(ji,jj,jk) - psinkflx(ji,jj,jk+1) ) / e3t_max_crs(ji,jj,jk) 883 #else 883 884 zflx = ( psinkflx(ji,jj,jk) - psinkflx(ji,jj,jk+1) ) / fse3t(ji,jj,jk) 885 #endif 884 886 ztrb(ji,jj,jk) = ztrb(ji,jj,jk) + 2. * zflx 885 887 END DO
Note: See TracChangeset
for help on using the changeset viewer.