Skip to content

change sw field names from cice #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeniseWorthen merged 1 commit into from
Feb 19, 2020
Merged

change sw field names from cice #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 45 additions & 1 deletion src/module_EARTH_GRID_COMP.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,51 @@ SUBROUTINE EARTH_REGISTER(EARTH_GRID_COMP,RC_REG)
line=__LINE__, &
file=__FILE__)) &
return ! bail out
endif
endif
if (.not. NUOPC_FieldDictionaryHasEntry( &
"mean_sw_pen_to_ocn_vis_dir_flx")) then
call NUOPC_FieldDictionaryAddEntry( &
standardName="mean_sw_pen_to_ocn_vis_dir_flx", &
canonicalUnits="W m-2", &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, &
file=__FILE__)) &
return ! bail out
endif
if (.not. NUOPC_FieldDictionaryHasEntry( &
"mean_sw_pen_to_ocn_vis_dif_flx")) then
call NUOPC_FieldDictionaryAddEntry( &
standardName="mean_sw_pen_to_ocn_vis_dif_flx", &
canonicalUnits="W m-2", &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, &
file=__FILE__)) &
return ! bail out
endif
if (.not. NUOPC_FieldDictionaryHasEntry( &
"mean_sw_pen_to_ocn_ir_dir_flx")) then
call NUOPC_FieldDictionaryAddEntry( &
standardName="mean_sw_pen_to_ocn_ir_dir_flx", &
canonicalUnits="W m-2", &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, &
file=__FILE__)) &
return ! bail out
endif
if (.not. NUOPC_FieldDictionaryHasEntry( &
"mean_sw_pen_to_ocn_ir_dif_flx")) then
call NUOPC_FieldDictionaryAddEntry( &
standardName="mean_sw_pen_to_ocn_ir_dif_flx", &
canonicalUnits="W m-2", &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, &
file=__FILE__)) &
return ! bail out
endif
if (.not. NUOPC_FieldDictionaryHasEntry( &
"inst_ir_dir_albedo")) then
call NUOPC_FieldDictionaryAddEntry( &
Expand Down
16 changes: 8 additions & 8 deletions src/module_MEDIATOR.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,10 +747,10 @@ subroutine SetServices(gcomp, rc)
! call fld_list_add(fldsFrIce,"stress_on_ocn_ice_idir" , "will provide","copy")
! call fld_list_add(fldsFrIce,"stress_on_ocn_ice_jdir" , "will provide","copy")
call fld_list_add(fldsFrIce,"mean_sw_pen_to_ocn" , "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_net_sw_vis_dir_flx" , "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_net_sw_vis_dif_flx" , "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_net_sw_ir_dir_flx" , "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_net_sw_ir_dif_flx" , "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_sw_pen_to_ocn_vis_dir_flx" , "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_sw_pen_to_ocn_vis_dif_flx" , "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_sw_pen_to_ocn_ir_dir_flx" , "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_sw_pen_to_ocn_ir_dif_flx" , "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_up_lw_flx_ice" , "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_sensi_heat_flx_atm_into_ice", "will provide","conservefrac")
call fld_list_add(fldsFrIce,"mean_laten_heat_flx_atm_into_ice", "will provide","conservefrac")
Expand Down Expand Up @@ -5644,28 +5644,28 @@ subroutine MedPhase_prep_ocn(gcomp, rc)

call fieldBundle_FieldMerge(is_local%wrap%FBforOcn,'mean_net_sw_vis_dir_flx' , &
is_local%wrap%FBAtm_o ,'mean_down_sw_vis_dir_flx',customwgt, &
is_local%wrap%FBIce_o ,'mean_net_sw_vis_dir_flx' ,icewgt, &
is_local%wrap%FBIce_o ,'mean_sw_pen_to_ocn_vis_dir_flx' ,icewgt, &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, file=__FILE__)) return ! bail out

call fieldBundle_FieldMerge(is_local%wrap%FBforOcn,'mean_net_sw_vis_dif_flx' , &
is_local%wrap%FBAtm_o ,'mean_down_sw_vis_dif_flx',customwgt, &
is_local%wrap%FBIce_o ,'mean_net_sw_vis_dif_flx',icewgt, &
is_local%wrap%FBIce_o ,'mean_sw_pen_to_ocn_vis_dif_flx',icewgt, &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, file=__FILE__)) return ! bail out

call fieldBundle_FieldMerge(is_local%wrap%FBforOcn,'mean_net_sw_ir_dir_flx' , &
is_local%wrap%FBAtm_o ,'mean_down_sw_ir_dir_flx',customwgt, &
is_local%wrap%FBIce_o ,'mean_net_sw_ir_dir_flx',icewgt, &
is_local%wrap%FBIce_o ,'mean_sw_pen_to_ocn_ir_dir_flx',icewgt, &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, file=__FILE__)) return ! bail out

call fieldBundle_FieldMerge(is_local%wrap%FBforOcn,'mean_net_sw_ir_dif_flx' , &
is_local%wrap%FBAtm_o ,'mean_down_sw_ir_dif_flx',customwgt, &
is_local%wrap%FBIce_o ,'mean_net_sw_ir_dif_flx',icewgt, &
is_local%wrap%FBIce_o ,'mean_sw_pen_to_ocn_ir_dif_flx',icewgt, &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, file=__FILE__)) return ! bail out
Expand Down