- Timestamp:
- 2015-11-30T12:48:01+01:00 (9 years ago)
- Location:
- branches/2014/dev_r4650_UKMO14.4_OBS_GENERAL_VINTERP/NEMOGCM/NEMO/OPA_SRC/IOM
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_r4650_UKMO14.4_OBS_GENERAL_VINTERP/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
r5950 r5951 129 129 ! 130 130 IF( ln_cfmeta ) THEN ! Add additional grid metadata 131 CALL iom_set_domain_attr("grid_T", area = e1 2t(nldi:nlei, nldj:nlej))132 CALL iom_set_domain_attr("grid_U", area = e1 2u(nldi:nlei, nldj:nlej))133 CALL iom_set_domain_attr("grid_V", area = e1 2v(nldi:nlei, nldj:nlej))134 CALL iom_set_domain_attr("grid_W", area = e1 2t(nldi:nlei, nldj:nlej))131 CALL iom_set_domain_attr("grid_T", area = e1e2t(nldi:nlei, nldj:nlej)) 132 CALL iom_set_domain_attr("grid_U", area = e1e2u(nldi:nlei, nldj:nlej)) 133 CALL iom_set_domain_attr("grid_V", area = e1e2v(nldi:nlei, nldj:nlej)) 134 CALL iom_set_domain_attr("grid_W", area = e1e2t(nldi:nlei, nldj:nlej)) 135 135 CALL set_grid_bounds( "T", glamf, gphif, glamt, gphit ) 136 136 CALL set_grid_bounds( "U", glamv, gphiv, glamu, gphiu ) … … 903 903 IF( zofs /= 0. ) pv_r1d(:) = pv_r1d(:) + zofs 904 904 ELSEIF( PRESENT(pv_r2d) ) THEN 905 !CDIR COLLAPSE906 905 IF( zscf /= 1.) pv_r2d(:,:) = pv_r2d(:,:) * zscf 907 !CDIR COLLAPSE908 906 IF( zofs /= 0.) pv_r2d(:,:) = pv_r2d(:,:) + zofs 909 907 ELSEIF( PRESENT(pv_r3d) ) THEN 910 !CDIR COLLAPSE911 908 IF( zscf /= 1.) pv_r3d(:,:,:) = pv_r3d(:,:,:) * zscf 912 !CDIR COLLAPSE913 909 IF( zofs /= 0.) pv_r3d(:,:,:) = pv_r3d(:,:,:) + zofs 914 910 ENDIF … … 1196 1192 CHARACTER(LEN=*),OPTIONAL , INTENT(in) :: freq_op 1197 1193 CHARACTER(LEN=*),OPTIONAL , INTENT(in) :: freq_offset 1198 IF ( xios_is_valid_field (cdid) ) CALL xios_set_field_attr ( cdid, freq_op=freq_op, freq_offset=freq_offset ) 1199 IF ( xios_is_valid_fieldgroup(cdid) ) CALL xios_set_fieldgroup_attr( cdid, freq_op=freq_op, freq_offset=freq_offset ) 1194 IF ( xios_is_valid_field (cdid) ) CALL xios_set_field_attr & 1195 & ( cdid, freq_op=freq_op, freq_offset=freq_offset ) 1196 IF ( xios_is_valid_fieldgroup(cdid) ) CALL xios_set_fieldgroup_attr & 1197 & ( cdid, freq_op=freq_op, freq_offset=freq_offset ) 1200 1198 CALL xios_solve_inheritance() 1201 1199 END SUBROUTINE iom_set_field_attr … … 1673 1671 END DO 1674 1672 1673 IF( jn == 1 .AND. TRIM(Agrif_CFixed()) /= '0' ) clname = TRIM(Agrif_CFixed())//"_"//TRIM(clname) 1675 1674 IF( jn == 1 ) CALL iom_set_file_attr( cdid, name = clname ) 1676 1675 IF( jn == 2 ) CALL iom_set_file_attr( cdid, name_suffix = clname ) … … 1720 1719 ENDIF 1721 1720 1721 !$AGRIF_DO_NOT_TREAT 1722 ! Should be fixed in the conv 1722 1723 IF( llfull ) THEN 1723 1724 clfmt = TRIM(clfmt)//",'_',i2.2,':',i2.2,':',i2.2" … … 1730 1731 WRITE(iom_sdate, '('//TRIM(clfmt)//')') iyear, imonth, iday ! date of the end of run 1731 1732 ENDIF 1733 !$AGRIF_END_DO_NOT_TREAT 1732 1734 1733 1735 END FUNCTION iom_sdate -
branches/2014/dev_r4650_UKMO14.4_OBS_GENERAL_VINTERP/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
r5950 r5951 9 9 !! 3.3 ! 2010-04 (M. Leclair, G. Madec) modified LF-RA 10 10 !! - - ! 2010-10 (C. Ethe, G. Madec) TRC-TRA merge (T-S in 4D) 11 !! 3.7 ! 2014-01 (G. Madec) suppression of curl and hdiv from the restart 12 !! - ! 2014-12 (G. Madec) remove KPP scheme 11 13 !!---------------------------------------------------------------------- 12 14 … … 18 20 USE oce ! ocean dynamics and tracers 19 21 USE dom_oce ! ocean space and time domain 22 USE sbc_ice ! only lk_lim3 20 23 USE phycst ! physical constants 24 USE eosbn2 ! equation of state (eos bn2 routine) 25 USE trdmxl_oce ! ocean active mixed layer tracers trends variables 26 ! 21 27 USE in_out_manager ! I/O manager 22 28 USE iom ! I/O module 23 USE eosbn2 ! equation of state (eos bn2 routine)24 USE trdmxl_oce ! ocean active mixed layer tracers trends variables25 USE divcur ! hor. divergence and curl (div & cur routines)26 29 27 30 IMPLICIT NONE … … 130 133 CALL iom_rstput( kt, nitrst, numrow, 'tb' , tsb(:,:,:,jp_tem) ) 131 134 CALL iom_rstput( kt, nitrst, numrow, 'sb' , tsb(:,:,:,jp_sal) ) 132 CALL iom_rstput( kt, nitrst, numrow, 'rotb' , rotb )133 CALL iom_rstput( kt, nitrst, numrow, 'hdivb' , hdivb )134 135 CALL iom_rstput( kt, nitrst, numrow, 'sshb' , sshb ) 135 136 ! … … 138 139 CALL iom_rstput( kt, nitrst, numrow, 'tn' , tsn(:,:,:,jp_tem) ) 139 140 CALL iom_rstput( kt, nitrst, numrow, 'sn' , tsn(:,:,:,jp_sal) ) 140 CALL iom_rstput( kt, nitrst, numrow, 'rotn' , rotn )141 CALL iom_rstput( kt, nitrst, numrow, 'hdivn' , hdivn )142 141 CALL iom_rstput( kt, nitrst, numrow, 'sshn' , sshn ) 143 142 CALL iom_rstput( kt, nitrst, numrow, 'rhop' , rhop ) 144 #if defined key_zdfkpp145 CALL iom_rstput( kt, nitrst, numrow, 'rhd' , rhd )146 #endif147 143 IF( kt == nitrst ) THEN 148 144 CALL iom_close( numrow ) ! close the restart file (only at last time step) … … 197 193 END SUBROUTINE rst_read_open 198 194 195 199 196 SUBROUTINE rst_read 200 197 !!---------------------------------------------------------------------- … … 227 224 CALL iom_get( numror, jpdom_autoglo, 'tb' , tsb(:,:,:,jp_tem) ) 228 225 CALL iom_get( numror, jpdom_autoglo, 'sb' , tsb(:,:,:,jp_sal) ) 229 CALL iom_get( numror, jpdom_autoglo, 'rotb' , rotb )230 CALL iom_get( numror, jpdom_autoglo, 'hdivb' , hdivb )231 226 CALL iom_get( numror, jpdom_autoglo, 'sshb' , sshb ) 232 227 ELSE … … 239 234 CALL iom_get( numror, jpdom_autoglo, 'sn' , tsn(:,:,:,jp_sal) ) 240 235 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn ) 241 IF( iom_varid( numror, 'rotn', ldstop = .FALSE. ) > 0 ) THEN242 CALL iom_get( numror, jpdom_autoglo, 'rotn' , rotn )243 CALL iom_get( numror, jpdom_autoglo, 'hdivn' , hdivn )244 ELSE245 CALL div_cur( 0 ) ! Horizontal divergence & Relative vorticity246 ENDIF247 236 IF( iom_varid( numror, 'rhop', ldstop = .FALSE. ) > 0 ) THEN 248 237 CALL iom_get( numror, jpdom_autoglo, 'rhop' , rhop ) ! now potential density … … 250 239 CALL eos ( tsn, rhd, rhop, fsdept_n(:,:,:) ) 251 240 ENDIF 252 #if defined key_zdfkpp253 IF( iom_varid( numror, 'rhd', ldstop = .FALSE. ) > 0 ) THEN254 CALL iom_get( numror, jpdom_autoglo, 'rhd' , rhd ) ! now in situ density anomaly255 ELSE256 CALL eos( tsn, rhd, fsdept_n(:,:,:) ) ! compute rhd257 ENDIF258 #endif259 241 ! 260 242 IF( neuler == 0 ) THEN ! Euler restart (neuler=0) … … 262 244 ub (:,:,:) = un (:,:,:) 263 245 vb (:,:,:) = vn (:,:,:) 264 rotb (:,:,:) = rotn (:,:,:)265 hdivb(:,:,:) = hdivn(:,:,:)266 246 sshb (:,:) = sshn (:,:) 267 247 ! 268 248 IF( lk_vvl ) THEN 269 249 DO jk = 1, jpk … … 271 251 END DO 272 252 ENDIF 273 253 ! 274 254 ENDIF 275 255 !
Note: See TracChangeset
for help on using the changeset viewer.