Changeset 15801
- Timestamp:
- 2022-04-25T18:52:24+02:00 (2 years ago)
- Location:
- NEMO/branches/UKMO/NEMO_4.0.4_FOAM_package_v3.6_bugfixes/src/OCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/UKMO/NEMO_4.0.4_FOAM_package_v3.6_bugfixes/src/OCE/DYN/dynspg_ts.F90
r14075 r15801 51 51 USE agrif_oce 52 52 #endif 53 #if defined key_asminc54 USE asminc ! Assimilation increment55 #endif56 53 ! 57 54 USE in_out_manager ! I/O manager … … 341 338 ENDIF 342 339 ! 343 #if defined key_asminc344 ! != Add the IAU weighted SSH increment =!345 ! ! ------------------------------------ !346 IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN347 zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:)348 ENDIF349 #endif350 340 ! != Fill boundary data arrays for AGRIF 351 341 ! ! ------------------------------------ -
NEMO/branches/UKMO/NEMO_4.0.4_FOAM_package_v3.6_bugfixes/src/OCE/OBS/obs_prep.F90
r15799 r15801 1293 1293 & .OR. ( pobsphi(jobs) > 90. ) & 1294 1294 & .OR. ( pobsdep(jobsp) < 0.0 ) & 1295 & .OR. ( pobsdep(jobsp) > gdepw_1d(kpk)) ) THEN1295 & .OR. ( pobsdep(jobsp) > maxdepw ) ) THEN 1296 1296 kobsqc(jobsp) = IBSET(kobsqc(jobsp),11) 1297 1297 kosdobs = kosdobs + 1 … … 1339 1339 1340 1340 ! Set observation depth equal to that of the first model depth 1341 IF ( pobsdep(jobsp) <= pdep(1) ) THEN 1342 pobsdep(jobsp) = pdep(1) 1343 ENDIF 1344 !IF ( pobsdep(jobsp) < MINVAL(zgdept(1:2,1:2,1,jobs) ) ) THEN 1345 ! pobsdep(jobsp) = MINVAL(zgdept(1:2,1:2,1,jobs)) 1346 !ENDIF 1341 IF ( pobsdep(jobsp) < MINVAL(zgdept(1:2,1:2,1,jobs) ) ) THEN 1342 pobsdep(jobsp) = MINVAL(zgdept(1:2,1:2,1,jobs)) 1343 ENDIF 1347 1344 1348 1345 ! Set observation depth equal to that of the last wet T-point 1349 !IF ( ( pobsdep(jobsp) > maxdept ) .AND. &1350 !& ( pobsdep(jobsp) < maxdepw ) ) THEN1351 !pobsdep(jobsp) = maxdept1352 !END IF1346 IF ( ( pobsdep(jobsp) > maxdept ) .AND. & 1347 & ( pobsdep(jobsp) < maxdepw ) ) THEN 1348 pobsdep(jobsp) = maxdept 1349 END IF 1353 1350 1354 1351 IF (ln_bdy) THEN
Note: See TracChangeset
for help on using the changeset viewer.