From 91e62c38064d9f611bf68b1d9b22748ed07b70b5 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 25 Jul 2024 11:48:07 +0200 Subject: [PATCH 1/2] always send Si_thick to mediator --- .../drivers/nuopc/cmeps/ice_import_export.F90 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cicecore/drivers/nuopc/cmeps/ice_import_export.F90 b/cicecore/drivers/nuopc/cmeps/ice_import_export.F90 index 60059e39a..5409c65cf 100644 --- a/cicecore/drivers/nuopc/cmeps/ice_import_export.F90 +++ b/cicecore/drivers/nuopc/cmeps/ice_import_export.F90 @@ -231,6 +231,7 @@ subroutine ice_advertise_fields(gcomp, importState, exportState, flds_scalar_nam ! ice states call fldlist_add(fldsFrIce_num, fldsFrIce, 'ice_mask' ) call fldlist_add(fldsFrIce_num, fldsFrIce, 'ice_fraction' ) + call fldlist_add(fldsFrIce_num, fldsFrIce, 'Si_thick' ) call fldlist_add(fldsFrIce_num, fldsFrIce, 'sea_ice_surface_temperature' ) call fldlist_add(fldsFrIce_num, fldsFrIce, 'mean_ice_volume' ) call fldlist_add(fldsFrIce_num, fldsFrIce, 'mean_snow_volume' ) @@ -250,7 +251,6 @@ subroutine ice_advertise_fields(gcomp, importState, exportState, flds_scalar_nam ungridded_lbound=1, ungridded_ubound=ncat) end if if (flds_wave) then - call fldlist_add(fldsFrIce_num, fldsFrIce, 'Si_thick' ) call fldlist_add(fldsFrIce_num, fldsFrIce, 'Si_floediam' ) end if @@ -970,14 +970,14 @@ subroutine ice_export( exportState, rc ) ! surface temperature Tsrf(i,j,iblk) = Tffresh + trcr(i,j,1,iblk) !Kelvin (original ???) - if (tr_fsd) then - ! floe thickness (m) - if (aice(i,j,iblk) > puny) then - floethick(i,j,iblk) = vice(i,j,iblk) / aice(i,j,iblk) - else - floethick(i,j,iblk) = c0 - end if + ! floe thickness (m) + if (aice(i,j,iblk) > puny) then + floethick(i,j,iblk) = vice(i,j,iblk) / aice(i,j,iblk) + else + floethick(i,j,iblk) = c0 + end if + if (tr_fsd) then ! floe diameter (m) workx = c0 worky = c0 From 416ace6595966b013393ed0f76d41cb707018ec3 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Mon, 19 Aug 2024 10:30:38 +0200 Subject: [PATCH 2/2] fixed diagnostic output to only go to mastertask --- cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 b/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 index b94fcff05..06088b43a 100644 --- a/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 +++ b/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 @@ -598,7 +598,9 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc) if (tfrz_option_driver /= tfrz_option) then write(errmsg,'(a)') trim(subname)//'WARNING: tfrz_option from driver '//trim(tfrz_option_driver)//& ' is overwriting tfrz_option from cice namelist '//trim(tfrz_option) - write(nu_diag,*) trim(errmsg) + if (my_task == master_task) then + write(nu_diag,*) trim(errmsg) + end if call icepack_warnings_flush(nu_diag) call icepack_init_parameters(tfrz_option_in=tfrz_option_driver) endif @@ -613,7 +615,9 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc) if (atmiter_conv_driver /= atmiter_conv) then write(errmsg,'(a,d13.5,a,d13.5)') trim(subname)//'WARNING: atmiter_ from driver ',& atmiter_conv_driver,' is overwritting atmiter_conv from cice namelist ',atmiter_conv - write(nu_diag,*) trim(errmsg) + if (my_task == master_task) then + write(nu_diag,*) trim(errmsg) + end if call icepack_warnings_flush(nu_diag) call icepack_init_parameters(atmiter_conv_in=atmiter_conv_driver) end if