- Timestamp:
- 2018-07-23T11:33:03+02:00 (6 years ago)
- Location:
- branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC/ASM
- Files:
-
- 2 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90
r7960 r9987 119 119 CALL iom_rstput( kt, nitbkg_r, inum, 'en' , en ) 120 120 #endif 121 CALL iom_rstput( kt, nitbkg_r, inum, 'gcx' , gcx ) 121 ! CALL iom_rstput( kt, nitbkg_r, inum, 'gcx' , gcx ) 122 CALL iom_rstput( kt, nitbkg_r, inum, 'avt' , avt ) 122 123 ! 123 124 CALL iom_close( inum ) … … 153 154 CALL iom_rstput( kt, nitdin_r, inum, 'tn' , tsn(:,:,:,jp_tem) ) 154 155 CALL iom_rstput( kt, nitdin_r, inum, 'sn' , tsn(:,:,:,jp_sal) ) 156 CALL iom_rstput( kt, nitdin_r, inum, 'avt' , avt ) 155 157 CALL iom_rstput( kt, nitdin_r, inum, 'sshn' , sshn ) 156 158 #if defined key_lim2 || defined key_lim3 -
branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
r9486 r9987 39 39 USE ice_2 ! LIM2 40 40 #endif 41 #if defined key_cice && defined key_asminc 42 USE sbc_ice, ONLY : & ! CICE Ice model variables 43 & ndaice_da, nfresh_da, nfsalt_da 44 #endif 41 45 USE sbc_oce ! Surface boundary condition variables. 42 46 … … 131 135 & ln_asmdin, ln_asmiau, & 132 136 & nitbkg, nitdin, nitiaustr, nitiaufin, niaufn, & 133 & ln_salfix, salfixmin, nn_divdmp 137 & ln_salfix, salfixmin, nn_divdmp, & 138 & ln_seaiceinc, ln_temnofreeze 134 139 !!---------------------------------------------------------------------- 135 140 … … 656 661 657 662 DO jk = 1, jpkm1 658 fzptnz(:,:,jk) = eos_fzp( tsn(:,:,jk,jp_sal), fsdept(:,:,jk) )663 CALL eos_fzp( tsn(:,:,jk,jp_sal), fzptnz(:,:,jk), fsdept(:,:,jk) ) 659 664 END DO 660 665 … … 890 895 ENDIF 891 896 897 ELSE 898 #if defined key_asminc 899 ssh_iau(:,:) = 0.0 900 #endif 892 901 ENDIF 893 902
Note: See TracChangeset
for help on using the changeset viewer.