Closed github-actions[bot] closed 1 year ago
Hi there, commit e9f06c74 has been pushed. Here is the comparison with the commit currently used.
⚠️WARNING⚠️ restart.F90 needs to be updated:
diff nemo/src/OCE/IOM/restart.F90 head/src/OCE/IOM/restart.F90 55c55 < !! $Id: restart.F90 15141 2021-07-23 14:20:12Z smasson $ --- > !! $Id: restart.F90 15027 2021-06-19 08:14:22Z techene $ 146c146 < SUBROUTINE rst_write( kt, Kbb, Kmm ) --- > SUBROUTINE rst_write( kt, Kbb, Kmm, Kaa ) 159a160 > INTEGER, OPTIONAL, INTENT(in) :: Kaa ! ocean time level index required for RK3 166a168,177 > ! > #if defined key_RK3 > CALL iom_rstput( kt, nitrst, numrow, 'sshn', ssh(:,: ,Kbb) ) ! before fields > CALL iom_rstput( kt, nitrst, numrow, 'un' , uu(:,:,: ,Kbb) ) > CALL iom_rstput( kt, nitrst, numrow, 'vn' , vv(:,:,: ,Kbb) ) > CALL iom_rstput( kt, nitrst, numrow, 'tn' , ts(:,:,:,jp_tem,Kbb) ) > CALL iom_rstput( kt, nitrst, numrow, 'sn' , ts(:,:,:,jp_sal,Kbb) ) > CALL iom_rstput( kt, nitrst, numrow, 'uu_n' , uu_b(:,: ,Kbb) ) > CALL iom_rstput( kt, nitrst, numrow, 'vv_n' , vv_b(:,: ,Kbb) ) > #else 172,174c183,184 < ! < #if ! defined key_RK3 < CALL iom_rstput( kt, nitrst, numrow, 'sshn', ssh(:,: ,Kmm) ) ! now fields --- > > CALL iom_rstput( kt, nitrst, numrow, 'sshn', ssh(:,: ,Kmm) ) ! now fields 179d188 < IF( .NOT.lk_SWE ) CALL iom_rstput( kt, nitrst, numrow, 'rhop', rhop ) 266a276 > INTEGER :: id1 287,290c297,320 < CALL iom_get( numror, jpdom_auto, 'ub', uu(:,:,: ,Kbb), cd_type = 'U', psgn = -1._wp ) < CALL iom_get( numror, jpdom_auto, 'vb', vv(:,:,: ,Kbb), cd_type = 'V', psgn = -1._wp ) < CALL iom_get( numror, jpdom_auto, 'tb', ts(:,:,:,jp_tem,Kbb) ) < CALL iom_get( numror, jpdom_auto, 'sb', ts(:,:,:,jp_sal,Kbb) ) --- > CALL iom_get( numror, jpdom_auto, 'un' , uu(:,:,: ,Kbb), cd_type = 'U', psgn = -1._wp ) > CALL iom_get( numror, jpdom_auto, 'vn' , vv(:,:,: ,Kbb), cd_type = 'V', psgn = -1._wp ) > CALL iom_get( numror, jpdom_auto, 'tn' , ts(:,:,:,jp_tem,Kbb) ) > CALL iom_get( numror, jpdom_auto, 'sn' , ts(:,:,:,jp_sal,Kbb) ) > id1 = iom_varid( numror, 'uu_n', ldstop = .FALSE. ) !* check presence > IF( id1 > 0 ) THEN > CALL iom_get( numror, jpdom_auto, 'uu_n' , uu_b(:,:,Kbb), cd_type = 'U', psgn = -1._wp ) > CALL iom_get( numror, jpdom_auto, 'vv_n' , vv_b(:,:,Kbb), cd_type = 'V', psgn = -1._wp ) > ELSE > uu_b(:,:,Kbb) = uu(:,:,1,Kbb)*e3u_0(:,:,1)*umask(:,:,1) > vv_b(:,:,Kbb) = vv(:,:,1,Kbb)*e3v_0(:,:,1)*vmask(:,:,1) > DO jk = 2, jpkm1 > uu_b(:,:,Kbb) = uu_b(:,:,Kbb) + uu(:,:,jk,Kbb)*e3u_0(:,:,jk)*umask(:,:,jk) > vv_b(:,:,Kbb) = vv_b(:,:,Kbb) + vv(:,:,jk,Kbb)*e3v_0(:,:,jk)*vmask(:,:,jk) > END DO > uu_b(:,:,Kbb) = uu_b(:,:,Kbb) * r1_hu_0(:,:) > vv_b(:,:,Kbb) = vv_b(:,:,Kbb) * r1_hv_0(:,:) > ENDIF > uu(:,:,: ,Kmm) = uu(:,:,: ,Kbb) ! Kmm values set to Kbb for initialisation (sbc_ssm_init) > vv(:,:,: ,Kmm) = vv(:,:,: ,Kbb) > ts(:,:,:,:,Kmm) = ts(:,:,:,:,Kbb) > ! > uu_b(:,:,Kmm) = uu_b(:,:,Kbb) ! Kmm value set to Kbb for initialisation in Agrif_Regrid > vv_b(:,:,Kmm) = vv_b(:,:,Kbb) 314,330d343 < IF( .NOT.lk_SWE ) THEN < IF( iom_varid( numror, 'rhop', ldstop = .FALSE. ) > 0 ) THEN < CALL iom_get( numror, jpdom_auto, 'rhop' , rhop ) ! now potential density < ELSE < #if defined key_qco < ALLOCATE( zgdept(jpi,jpj,jpk) ) < DO jk = 1, jpk < zgdept(:,:,jk) = gdept(:,:,jk,Kmm) < END DO < CALL eos( ts(:,:,:,:,Kmm), rhd, rhop, zgdept ) < DEALLOCATE( zgdept ) < #else < CALL eos( ts(:,:,:,:,Kmm), rhd, rhop, gdept(:,:,:,Kmm) ) < #endif < ENDIF < ENDIF < ! 370c383 < CALL iom_get( numror, jpdom_auto, 'sshb' , ssh(:,:,Kbb) ) --- > CALL iom_get( numror, jpdom_auto, 'sshn' , ssh(:,:,Kbb) ) 373c386,387 < ssh(:,:,Kmm) = 0._wp --- > ssh(:,:,Kmm) = ssh(:,:,Kbb) > ! 423,429c437,438 < ! Set ghosts points from parent < IF (.NOT.Agrif_Root()) CALL Agrif_istate_ssh( Kbb, Kmm, Kaa, .true. ) < #endif < #if defined key_RK3 < ssh(:,:,Kmm) = 0._wp !* RK3: set Kmm to 0 for AGRIF < #else < ssh(:,:,Kmm) = ssh(:,:,Kbb) !* MLF: set now values from to before ones --- > ! Set ghosts points from parent > IF (.NOT.Agrif_Root()) CALL Agrif_istate_ssh( Kbb, Kmm, Kaa, .true. ) 430a440,441 > ! > ssh(:,:,Kmm) = ssh(:,:,Kbb) !* set now values from to before ones
⚠️WARNING⚠️ cfgs/SHARED/field_def_nemo-ice.xml has changed:
cfgs/SHARED/field_def_nemo-ice.xml
diff ./nemo/cfgs/SHARED/field_def_nemo-ice.xml ./head/cfgs/SHARED/field_def_nemo-ice.xml 202a203,208 > <!-- vp rheology convergence tests --> > <field id="velo_res" long_name="sea ice velocity residual" standard_name="sea_ice_velocity_residual" unit="N/m2" /> > <field id="velo_ero" long_name="sea ice velocity error last outer iteration" standard_name="sea_ice_velocity_outer_error" unit="m/s" /> > <field id="uice_eri" long_name="uice velocity error last inner iteration" standard_name="sea_ice_u_velocity_inner_error" unit="m/s" /> > <field id="vice_eri" long_name="vice velocity error last inner iteration" standard_name="sea_ice_v_velocity_inner_error" unit="m/s" /> > 432c438 < <field field_ref="icedlt" name="sidelta" /> --- > <field field_ref="icedlt" name="sidelt" />
⚠️WARNING⚠️ cfgs/SHARED/namelist_ref has changed:
cfgs/SHARED/namelist_ref
diff ./nemo/cfgs/SHARED/namelist_ref ./head/cfgs/SHARED/namelist_ref 1010a1011,1014 > nn_vvl_interp = 2 ! interpolation method of scale factor anomalies at U/V/F points > ! =0 linear even at the bottom (old) > ! =1 linear with bottom correction > ! =2 proportionnal to scale factors at rest ("qco" like) 1198c1202 < nn_mxlice = 2 ! type of scaling under sea-ice --- > nn_mxlice = 0 ! type of scaling under sea-ice 1244c1248 < nn_mxlice = 1 ! mixing under sea ice --- > nn_mxlice = 0 ! mixing under sea ice 1540a1545,1558 > ln_sto_ldf = .false. ! stochastic lateral diffusion > rn_ldf_std = 0.1 ! lateral diffusion standard deviation (in percent) > rn_ldf_tcor = 1440. ! lateral diffusion correlation timescale (in timesteps) > ln_sto_hpg = .false. ! stochastic pressure gradient > rn_hpg_std = 0.1 ! density gradient standard deviation (in percent) > rn_hpg_tcor = 1440. ! density gradient correlation timescale (in timesteps) > ln_sto_pstar = .false. ! stochastic ice strength > rn_pstar_std = 0.1 ! ice strength standard deviation (in percent) > rn_pstar_tcor = 1440. ! ice strength correlation timescale (in timesteps) > nn_pstar_ord = 1 ! order of autoregressive processes > nn_pstar_flt = 0 ! passes of Laplacian filter > ln_sto_trd = .false. ! stochastic model trend > rn_trd_std = 0.1 ! trend standard deviation (in percent) > rn_trd_tcor = 1440. ! trend correlation timescale (in timesteps) 1548a1567,1574 > ln_sto_trc = .false. ! stochastic tracer dynamics > nn_sto_trc = 1 ! number of independent random walks > rn_trc_stdxy = 1.4 ! random walk horz. standard deviation (in grid points) > rn_trc_stdz = 0.7 ! random walk vert. standard deviation (in grid points) > rn_trc_tcor = 1440. ! random walk time correlation (in timesteps) > nn_trc_ord = 1 ! order of autoregressive processes > nn_trc_flt = 0 ! passes of Laplacian filter > rn_trc_lim = 3.0 ! limitation factor (default = 3.0)
⚠️WARNING⚠️ cfgs/SHARED/grid_def_nemo.xml has changed:
cfgs/SHARED/grid_def_nemo.xml
diff ./nemo/cfgs/SHARED/grid_def_nemo.xml ./head/cfgs/SHARED/grid_def_nemo.xml 15c15 < <domain domain_ref="grid_T_inner" /> --- > <domain domain_ref="grid_T_inner" name="grid_T" /> 23c23 < <domain domain_ref="grid_T_inner" /> --- > <domain domain_ref="grid_T_inner" name="grid_T" /> 32c32 < <domain domain_ref="grid_T_inner" /> --- > <domain domain_ref="grid_T_inner" name="grid_T" /> 41c41 < <domain domain_ref="grid_T_inner" /> --- > <domain domain_ref="grid_T_inner" name="grid_T" /> 49c49 < <domain domain_ref="grid_U_inner" /> --- > <domain domain_ref="grid_U_inner" name="grid_U" /> 57c57 < <domain domain_ref="grid_U_inner" /> --- > <domain domain_ref="grid_U_inner" name="grid_U" /> 65c65 < <domain domain_ref="grid_V_inner" /> --- > <domain domain_ref="grid_V_inner" name="grid_V" /> 73c73 < <domain domain_ref="grid_V_inner" /> --- > <domain domain_ref="grid_V_inner" name="grid_V" /> 81c81 < <domain domain_ref="grid_W_inner" /> --- > <domain domain_ref="grid_W_inner" name="grid_W" /> 89c89 < <domain domain_ref="grid_W_inner" /> --- > <domain domain_ref="grid_W_inner" name="grid_W" /> 97c97 < <domain domain_ref="grid_F_inner" /> --- > <domain domain_ref="grid_F_inner" name="grid_F" /> 105c105 < <domain domain_ref="grid_F_inner" /> --- > <domain domain_ref="grid_F_inner" name="grid_F" />
Hi there, commit e9f06c74 has been pushed. Here is the comparison with the commit currently used.
⚠️WARNING⚠️ restart.F90 needs to be updated:
⚠️WARNING⚠️
cfgs/SHARED/field_def_nemo-ice.xmlhas changed:⚠️WARNING⚠️
cfgs/SHARED/namelist_refhas changed:⚠️WARNING⚠️
cfgs/SHARED/grid_def_nemo.xmlhas changed: