Changeset 12950 for NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF
- Timestamp:
- 2020-05-19T12:53:16+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdfgls.F90
r12489 r12950 1025 1025 CALL gls_rst( nit000, 'READ' ) ! (en, avt_k, avm_k, hmxl_n) 1026 1026 ! 1027 IF( lwxios ) THEN1028 CALL iom_set_rstw_var_active('en')1029 CALL iom_set_rstw_var_active('avt_k')1030 CALL iom_set_rstw_var_active('avm_k')1031 CALL iom_set_rstw_var_active('hmxl_n')1032 ENDIF1033 !1034 1027 END SUBROUTINE zdf_gls_init 1035 1028 … … 1059 1052 ! ! --------------- 1060 1053 IF( ln_rstart ) THEN !* Read the restart file 1054 IF( lrxios ) CALL iom_swap( TRIM(crxios_context) ) 1061 1055 id1 = iom_varid( numror, 'en' , ldstop = .FALSE. ) 1062 1056 id2 = iom_varid( numror, 'avt_k' , ldstop = .FALSE. ) … … 1076 1070 ! avt_k, avm_k already set to the background value in zdf_phy_init 1077 1071 ENDIF 1072 IF( lrxios ) CALL iom_swap( TRIM(cxios_context) ) 1078 1073 ELSE !* Start from rest 1079 1074 IF(lwp) WRITE(numout,*) -
NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdfosm.F90
r12489 r12950 1424 1424 ghamv(:,:,:) = 0. 1425 1425 ! 1426 IF( lwxios ) THEN1427 CALL iom_set_rstw_var_active('wn')1428 CALL iom_set_rstw_var_active('hbl')1429 CALL iom_set_rstw_var_active('hbli')1430 ENDIF1431 1426 END SUBROUTINE zdf_osm_init 1432 1427 … … 1459 1454 !!----------------------------------------------------------------------------- 1460 1455 IF( TRIM(cdrw) == 'READ'.AND. ln_rstart) THEN 1456 IF( lrxios ) CALL iom_swap( TRIM(crxios_context) ) 1461 1457 id1 = iom_varid( numror, 'wn' , ldstop = .FALSE. ) 1462 1458 IF( id1 > 0 ) THEN ! 'wn' exists; read … … 1473 1469 CALL iom_get( numror, jpdom_autoglo, 'hbli', hbli, ldxios = lrxios ) 1474 1470 WRITE(numout,*) ' ===>>>> : hbl & hbli read from restart file' 1471 IF( lrxios ) CALL iom_swap( TRIM(cxios_context) ) 1475 1472 RETURN 1476 1473 ELSE ! 'hbl' & 'hbli' not in restart file, recalculate 1477 1474 WRITE(numout,*) ' ===>>>> : previous run without osmosis scheme, hbl computed from stratification' 1478 1475 END IF 1476 IF( lrxios ) CALL iom_swap( TRIM(cxios_context) ) 1479 1477 END IF 1480 1478 -
NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdfric.F90
r12489 r12950 103 103 CALL ric_rst( nit000, 'READ' ) !* read or initialize all required files 104 104 ! 105 IF( lwxios ) THEN106 CALL iom_set_rstw_var_active('avt_k')107 CALL iom_set_rstw_var_active('avm_k')108 ENDIF109 105 END SUBROUTINE zdf_ric_init 110 106 … … 210 206 ! !* Read the restart file 211 207 IF( ln_rstart ) THEN 208 IF( lrxios ) CALL iom_swap( TRIM(crxios_context) ) 212 209 id1 = iom_varid( numror, 'avt_k', ldstop = .FALSE. ) 213 210 id2 = iom_varid( numror, 'avm_k', ldstop = .FALSE. ) … … 217 214 CALL iom_get( numror, jpdom_autoglo, 'avm_k', avm_k, ldxios = lrxios ) 218 215 ENDIF 216 IF( lrxios ) CALL iom_swap( TRIM(cxios_context) ) 219 217 ENDIF 220 218 ! !* otherwise Kz already set to the background value in zdf_phy_init -
NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdftke.F90
r12702 r12950 634 634 CALL tke_rst( nit000, 'READ' ) ! (en, avt_k, avm_k, dissl) 635 635 ! 636 IF( lwxios ) THEN637 CALL iom_set_rstw_var_active('en')638 CALL iom_set_rstw_var_active('avt_k')639 CALL iom_set_rstw_var_active('avm_k')640 CALL iom_set_rstw_var_active('dissl')641 ENDIF642 636 END SUBROUTINE zdf_tke_init 643 637 … … 665 659 ! ! --------------- 666 660 IF( ln_rstart ) THEN !* Read the restart file 661 IF( lrxios ) CALL iom_swap( TRIM(crxios_context) ) 667 662 id1 = iom_varid( numror, 'en' , ldstop = .FALSE. ) 668 663 id2 = iom_varid( numror, 'avt_k', ldstop = .FALSE. ) … … 682 677 ! avt_k, avm_k already set to the background value in zdf_phy_init 683 678 ENDIF 679 IF( lrxios ) CALL iom_swap( TRIM(cxios_context) ) 684 680 ELSE !* Start from rest 685 681 IF(lwp) WRITE(numout,*)
Note: See TracChangeset
for help on using the changeset viewer.