Changeset 9975 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC
- Timestamp:
- 2018-07-19T17:46:32+02:00 (6 years ago)
- Location:
- branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90
r6486 r9975 210 210 ! 211 211 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: ztemp2d ! temporary array to read ahmcoef file 212 LOGICAL :: tempmask( jpi,jpj) ! Temporary mask to avoid Cray compiler bug at cce 8.3.4 212 213 !!---------------------------------------------------------------------- 213 214 ! … … 252 253 zemax = MAXVAL ( e1t(:,:) * e2t(:,:), tmask(:,:,1) .GE. 0.5 ) 253 254 zemin = MINVAL ( e1t(:,:) * e2t(:,:), tmask(:,:,1) .GE. 0.5 ) 254 zeref = MAXVAL ( e1t(:,:) * e2t(:,:), & 255 & tmask(:,:,1) .GE. 0.5 .AND. ABS(gphit(:,:)) .GT. 50. ) 255 tempmask(:,:) = .FALSE. 256 ! Pre calculate mask for zeref since embedding the following 257 ! term in the MAXVAL operation offends the Cray compiler for no 258 ! justifiable reason under certain conditions. 259 tempmask(:,:) = (tmask(:,:,1) .GE. 0.5) .AND. (ABS(gphit(:,:)) .GT. 50.) 260 zeref = MAXVAL ( e1t(:,:) * e2t(:,:), tempmask(:,:) ) 256 261 257 262 DO jj = 1, jpj -
branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90
r8400 r9975 167 167 168 168 #if defined key_cice 169 ALLOCATE( qla_ice(jpi,jpj,ncat) , qlw_ice(jpi,jpj,1) , qsr_ice(jpi,jpj, 1), &169 ALLOCATE( qla_ice(jpi,jpj,ncat) , qlw_ice(jpi,jpj,1) , qsr_ice(jpi,jpj,jpl) , & 170 170 wndi_ice(jpi,jpj) , tatm_ice(jpi,jpj) , qatm_ice(jpi,jpj) , & 171 171 wndj_ice(jpi,jpj) , nfrzmlt(jpi,jpj) , ss_iou(jpi,jpj) , & … … 180 180 IF( ln_cpl ) ALLOCATE( u_ice(jpi,jpj) , fr1_i0(jpi,jpj) , tn_ice (jpi,jpj,jpl) , & 181 181 & v_ice(jpi,jpj) , fr2_i0(jpi,jpj) , alb_ice(jpi,jpj,1) , & 182 & emp_ice(jpi,jpj) , qns_ice(jpi,jpj, 1), dqns_ice(jpi,jpj,1) , &182 & emp_ice(jpi,jpj) , qns_ice(jpi,jpj,jpl) , dqns_ice(jpi,jpj,1) , & 183 183 & a_p(jpi,jpj,jpl) , ht_p(jpi,jpj,jpl) , tsfc_ice(jpi,jpj,jpl) , & 184 184 & kn_ice(jpi,jpj,jpl) , STAT=ierr(2) ) -
branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90
r8400 r9975 1178 1178 1179 1179 SUBROUTINE sbc_ice_cice ( kt, ksbc ) ! Dummy routine 1180 IMPLICIT NONE 1181 INTEGER, INTENT(in) :: kt ! ocean time-step index 1182 INTEGER, INTENT(in) :: ksbc ! surface forcing type 1180 1183 WRITE(*,*) 'sbc_ice_cice: You should not have seen this print! error?', kt 1181 1184 END SUBROUTINE sbc_ice_cice 1182 1185 1183 1186 SUBROUTINE cice_sbc_init (ksbc) ! Dummy routine 1187 IMPLICIT NONE 1188 INTEGER, INTENT(in) :: ksbc ! surface forcing type 1184 1189 WRITE(*,*) 'cice_sbc_init: You should not have seen this print! error?' 1185 1190 END SUBROUTINE cice_sbc_init 1186 1191 1187 1192 SUBROUTINE cice_sbc_final ! Dummy routine 1193 IMPLICIT NONE 1188 1194 WRITE(*,*) 'cice_sbc_final: You should not have seen this print! error?' 1189 1195 END SUBROUTINE cice_sbc_final -
branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/oce.F90
r8280 r9975 101 101 INTEGER :: ierr(5) 102 102 !!---------------------------------------------------------------------- 103 ierr(:) = 0 103 104 ! 104 105 ALLOCATE( ub (jpi,jpj,jpk) , un (jpi,jpj,jpk) , ua(jpi,jpj,jpk) , &
Note: See TracChangeset
for help on using the changeset viewer.