From e8b3ef615eb332198846cd7848d093672504cf30 Mon Sep 17 00:00:00 2001 From: Ufuk Turuncoglu Date: Mon, 15 Jul 2024 16:23:01 -0500 Subject: [PATCH 1/3] fix nuopc cap for radiation stress components --- model/src/wav_import_export.F90 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/model/src/wav_import_export.F90 b/model/src/wav_import_export.F90 index e6caa1a2d..4a9af31d7 100644 --- a/model/src/wav_import_export.F90 +++ b/model/src/wav_import_export.F90 @@ -145,6 +145,9 @@ subroutine advertise_fields(importState, ExportState, flds_scalar_name, rc) call fldlist_add(fldsFrWav_num, fldsFrWav, 'Sw_vstokes') else call fldlist_add(fldsFrWav_num, fldsFrWav, 'Sw_z0') + call fldlist_add(fldsFrWav_num, fldsFrWav, 'Sw_wavsuu') + call fldlist_add(fldsFrWav_num, fldsFrWav, 'Sw_wavsuv') + call fldlist_add(fldsFrWav_num, fldsFrWav, 'Sw_wavsvv') end if call fldlist_add(fldsFrWav_num, fldsFrWav, 'Sw_pstokes_x', ungridded_lbound=1, ungridded_ubound=3) call fldlist_add(fldsFrWav_num, fldsFrWav, 'Sw_pstokes_y', ungridded_lbound=1, ungridded_ubound=3) @@ -753,14 +756,14 @@ subroutine export_fields (gcomp, rc) call CalcBotcur( va, wbcuru, wbcurv, wbcurp) end if - if ( state_fldchk(exportState, 'wavsuu') .and. & - state_fldchk(exportState, 'wavsuv') .and. & - state_fldchk(exportState, 'wavsvv')) then - call state_getfldptr(exportState, 'sxxn', sxxn, rc=rc) + if ( state_fldchk(exportState, 'Sw_wavsuu') .and. & + state_fldchk(exportState, 'Sw_wavsuv') .and. & + state_fldchk(exportState, 'Sw_wavsvv')) then + call state_getfldptr(exportState, 'Sw_wavsuu', sxxn, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return - call state_getfldptr(exportState, 'sxyn', sxyn, rc=rc) + call state_getfldptr(exportState, 'Sw_wavsuv', sxyn, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return - call state_getfldptr(exportState, 'syyn', syyn, rc=rc) + call state_getfldptr(exportState, 'Sw_wavsvv', syyn, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return call CalcRadstr2D( va, sxxn, sxyn, syyn) end if From f13050bba3ff566d96fe1e180bda1db92eae0914 Mon Sep 17 00:00:00 2001 From: Ufuk Turuncoglu Date: Mon, 22 Jul 2024 11:41:03 -0500 Subject: [PATCH 2/3] fix type in the radiation stress components --- model/src/wav_grdout.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/src/wav_grdout.F90 b/model/src/wav_grdout.F90 index 4583070d7..4cde5e7e0 100644 --- a/model/src/wav_grdout.F90 +++ b/model/src/wav_grdout.F90 @@ -223,8 +223,8 @@ subroutine initialize_gridout ! 6 Wave-ocean layer gridoutdefs(6,1:25) = [ & - varatts( "SXY ", "SXX ", "Radiation stresses xx ", "N m-1 ", " ", .false.) , & - varatts( "SXY ", "SYY ", "Radiation stresses yy ", "N m-1 ", " ", .false.) , & + varatts( "SXX ", "SXX ", "Radiation stresses xx ", "N m-1 ", " ", .false.) , & + varatts( "SYY ", "SYY ", "Radiation stresses yy ", "N m-1 ", " ", .false.) , & varatts( "SXY ", "SXY ", "Radiation stresses xy ", "N m-1 ", " ", .false.) , & varatts( "TWO ", "TAUOX ", "Wave to ocean momentum flux x ", "m2 s-2 ", " ", .false.) , & varatts( "TWO ", "TAUOY ", "Wave to ocean momentum flux y ", "m2 s-2 ", " ", .false.) , & From 5debd4200d0334390d04ca38580026fb86ff4f09 Mon Sep 17 00:00:00 2001 From: Ufuk Turuncoglu Date: Mon, 29 Jul 2024 12:24:49 -0500 Subject: [PATCH 3/3] fix ww3 restart issue --- model/src/w3iorsmd.F90 | 1 + 1 file changed, 1 insertion(+) diff --git a/model/src/w3iorsmd.F90 b/model/src/w3iorsmd.F90 index 24d9a280c..6bc959baf 100644 --- a/model/src/w3iorsmd.F90 +++ b/model/src/w3iorsmd.F90 @@ -1376,6 +1376,7 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT ) TICE(1) = -1 TICE(2) = 0 TRHO(1) = -1 + TRHO(2) = 0 TIC1(1) = -1 TIC1(2) = 0 TIC5(1) = -1