From 101d1093dd4a70a6cb66629829aa6c153328db06 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sun, 16 Feb 2020 22:01:56 +0000 Subject: [PATCH] change sw field names from cice --- src/module_EARTH_GRID_COMP.F90 | 46 +++++++++++++++++++++++++++++++++- src/module_MEDIATOR.F90 | 16 ++++++------ 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/src/module_EARTH_GRID_COMP.F90 b/src/module_EARTH_GRID_COMP.F90 index 6cac85ea..66d0945a 100644 --- a/src/module_EARTH_GRID_COMP.F90 +++ b/src/module_EARTH_GRID_COMP.F90 @@ -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( & diff --git a/src/module_MEDIATOR.F90 b/src/module_MEDIATOR.F90 index 5241cc6b..16a4d73f 100644 --- a/src/module_MEDIATOR.F90 +++ b/src/module_MEDIATOR.F90 @@ -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") @@ -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