From ff858c77a5d1d0168924cfb7a1aba7938e6b35f4 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Tue, 29 Nov 2016 09:34:18 -0500 Subject: [PATCH] Corrected variable names (changed extrinsic to extensive) - Extensive and intensive flags in types and arguments to functions were written as extrinsic and intrinsic. --- src/core/MOM.F90 | 10 +++---- src/core/MOM_dynamics_split_RK2.F90 | 8 +++--- src/core/MOM_dynamics_unsplit.F90 | 4 +-- src/core/MOM_dynamics_unsplit_RK2.F90 | 4 +-- src/framework/MOM_diag_mediator.F90 | 40 +++++++++++++-------------- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/core/MOM.F90 b/src/core/MOM.F90 index c3e5b2ba1a..22f5c9eb6a 100644 --- a/src/core/MOM.F90 +++ b/src/core/MOM.F90 @@ -2822,7 +2822,7 @@ subroutine register_diags(Time, G, GV, CS, ADp) 'Meridional velocity', 'meter second-1', cmor_field_name='vo', cmor_units='m s-1', & cmor_standard_name='sea_water_y_velocity', cmor_long_name='Sea Water Y Velocity') CS%id_h = register_diag_field('ocean_model', 'h', diag%axesTL, Time, & - 'Layer Thickness', thickness_units, v_extrinsic=.true.) + 'Layer Thickness', thickness_units, v_extensive=.true.) CS%id_volo = register_scalar_field('ocean_model', 'volo', Time, diag,& long_name='Total volume of liquid ocean', units='m3', & @@ -2972,7 +2972,7 @@ subroutine register_diags(Time, G, GV, CS, ADp) CS%id_v_predia = register_diag_field('ocean_model', 'v_predia', diag%axesCvL, Time, & 'Meridional velocity before diabatic forcing', 'meter second-1') CS%id_h_predia = register_diag_field('ocean_model', 'h_predia', diag%axesTL, Time, & - 'Layer Thickness before diabatic forcing', thickness_units, v_extrinsic=.true.) + 'Layer Thickness before diabatic forcing', thickness_units, v_extensive=.true.) CS%id_e_predia = register_diag_field('ocean_model', 'e_predia', diag%axesTi, Time, & 'Interface Heights before diabatic forcing', 'meter') if (CS%diabatic_first .and. (.not. CS%adiabatic)) then @@ -2981,7 +2981,7 @@ subroutine register_diags(Time, G, GV, CS, ADp) CS%id_v_preale = register_diag_field('ocean_model', 'v_preale', diag%axesCvL, Time, & 'Meridional velocity before remapping', 'meter second-1') CS%id_h_preale = register_diag_field('ocean_model', 'h_preale', diag%axesTL, Time, & - 'Layer Thickness before remapping', thickness_units, v_extrinsic=.true.) + 'Layer Thickness before remapping', thickness_units, v_extensive=.true.) CS%id_T_preale = register_diag_field('ocean_model', 'T_preale', diag%axesTL, Time, & 'Temperature before remapping', 'degC') CS%id_S_preale = register_diag_field('ocean_model', 'S_preale', diag%axesTL, Time, & @@ -3040,7 +3040,7 @@ subroutine register_diags_TS_tendency(Time, G, CS) cmor_field_name="opottemptend", cmor_units="W m-2", & cmor_standard_name="tendency_of_sea_water_potential_temperature_expressed_as_heat_content", & cmor_long_name ="Tendency of Sea Water Potential Temperature Expressed as Heat Content", & - v_extrinsic=.true.) + v_extensive=.true.) CS%id_Th_tendency_2d = register_diag_field('ocean_model', 'Th_tendency_2d', diag%axesT1, Time, & 'Vertical sum of net time tendency for heat', 'W/m2', & cmor_field_name="opottemptend_2d", cmor_units="W m-2", & @@ -3080,7 +3080,7 @@ subroutine register_diags_TS_tendency(Time, G, CS) cmor_field_name="osalttend", cmor_units="kg m-2 s-1", & cmor_standard_name="tendency_of_sea_water_salinity_expressed_as_salt_content", & cmor_long_name ="Tendency of Sea Water Salinity Expressed as Salt Content", & - v_extrinsic=.true.) + v_extensive=.true.) CS%id_Sh_tendency_2d = register_diag_field('ocean_model', 'Sh_tendency_2d', diag%axesT1, Time, & 'Vertical sum of net time tendency for salt', 'kg/(m2 * s)', & cmor_field_name="osalttend_2d", cmor_units="kg m-2 s-1", & diff --git a/src/core/MOM_dynamics_split_RK2.F90 b/src/core/MOM_dynamics_split_RK2.F90 index d6dbc1aefc..e9ca093217 100644 --- a/src/core/MOM_dynamics_split_RK2.F90 +++ b/src/core/MOM_dynamics_split_RK2.F90 @@ -1203,17 +1203,17 @@ subroutine initialize_dyn_split_RK2(u, v, h, uh, vh, eta, Time, G, GV, param_fil flux_units = get_flux_units(GV) CS%id_uh = register_diag_field('ocean_model', 'uh', diag%axesCuL, Time, & - 'Zonal Thickness Flux', flux_units, y_cell_method='sum', v_extrinsic=.true.) + 'Zonal Thickness Flux', flux_units, y_cell_method='sum', v_extensive=.true.) CS%id_vh = register_diag_field('ocean_model', 'vh', diag%axesCvL, Time, & - 'Meridional Thickness Flux', flux_units, x_cell_method='sum', v_extrinsic=.true.) + 'Meridional Thickness Flux', flux_units, x_cell_method='sum', v_extensive=.true.) CS%id_umo = register_diag_field('ocean_model', 'umo', & diag%axesCuL, Time,'Zonal Mass Transport (including SGS param)', 'kg/s',& cmor_standard_name='ocean_mass_x_transport', cmor_long_name='Ocean Mass X Transport', & - conversion=GV%H_to_kg_m2, y_cell_method='sum', v_extrinsic=.true.) + conversion=GV%H_to_kg_m2, y_cell_method='sum', v_extensive=.true.) CS%id_vmo = register_diag_field('ocean_model', 'vmo', & diag%axesCvL, Time,'Meridional Mass Transport (including SGS param)', 'kg/s',& cmor_standard_name='ocean_mass_y_transport', cmor_long_name='Ocean Mass Y Transport', & - conversion=GV%H_to_kg_m2, x_cell_method='sum', v_extrinsic=.true.) + conversion=GV%H_to_kg_m2, x_cell_method='sum', v_extensive=.true.) CS%id_umo_2d = register_diag_field('ocean_model', 'umo_2d', & diag%axesCu1, Time,'Zonal Mass Transport (including SGS param) Vertical Sum', 'kg/s',& cmor_standard_name='ocean_mass_x_transport_vertical_sum', & diff --git a/src/core/MOM_dynamics_unsplit.F90 b/src/core/MOM_dynamics_unsplit.F90 index 4e37bdcd75..a0a0ce9af2 100644 --- a/src/core/MOM_dynamics_unsplit.F90 +++ b/src/core/MOM_dynamics_unsplit.F90 @@ -695,9 +695,9 @@ subroutine initialize_dyn_unsplit(u, v, h, Time, G, GV, param_file, diag, CS, & flux_units = get_flux_units(GV) CS%id_uh = register_diag_field('ocean_model', 'uh', diag%axesCuL, Time, & - 'Zonal Thickness Flux', flux_units, y_cell_method='sum', v_extrinsic=.true.) + 'Zonal Thickness Flux', flux_units, y_cell_method='sum', v_extensive=.true.) CS%id_vh = register_diag_field('ocean_model', 'vh', diag%axesCvL, Time, & - 'Meridional Thickness Flux', flux_units, x_cell_method='sum', v_extrinsic=.true.) + 'Meridional Thickness Flux', flux_units, x_cell_method='sum', v_extensive=.true.) CS%id_CAu = register_diag_field('ocean_model', 'CAu', diag%axesCuL, Time, & 'Zonal Coriolis and Advective Acceleration', 'meter second-2') CS%id_CAv = register_diag_field('ocean_model', 'CAv', diag%axesCvL, Time, & diff --git a/src/core/MOM_dynamics_unsplit_RK2.F90 b/src/core/MOM_dynamics_unsplit_RK2.F90 index e0a57f73d4..8ae5fb2302 100644 --- a/src/core/MOM_dynamics_unsplit_RK2.F90 +++ b/src/core/MOM_dynamics_unsplit_RK2.F90 @@ -651,9 +651,9 @@ subroutine initialize_dyn_unsplit_RK2(u, v, h, Time, G, GV, param_file, diag, CS flux_units = get_flux_units(GV) CS%id_uh = register_diag_field('ocean_model', 'uh', diag%axesCuL, Time, & - 'Zonal Thickness Flux', flux_units, y_cell_method='sum', v_extrinsic=.true.) + 'Zonal Thickness Flux', flux_units, y_cell_method='sum', v_extensive=.true.) CS%id_vh = register_diag_field('ocean_model', 'vh', diag%axesCvL, Time, & - 'Meridional Thickness Flux', flux_units, x_cell_method='sum', v_extrinsic=.true.) + 'Meridional Thickness Flux', flux_units, x_cell_method='sum', v_extensive=.true.) CS%id_CAu = register_diag_field('ocean_model', 'CAu', diag%axesCuL, Time, & 'Zonal Coriolis and Advective Acceleration', 'meter second-2') CS%id_CAv = register_diag_field('ocean_model', 'CAv', diag%axesCvL, Time, & diff --git a/src/framework/MOM_diag_mediator.F90 b/src/framework/MOM_diag_mediator.F90 index b687071cd0..c3f0f554a9 100644 --- a/src/framework/MOM_diag_mediator.F90 +++ b/src/framework/MOM_diag_mediator.F90 @@ -133,7 +133,7 @@ module MOM_diag_mediator real, pointer, dimension(:,:,:) :: mask3d => null() type(diag_type), pointer :: next => null() !< Pointer to the next diag. real :: conversion_factor = 0. !< A factor to multiply data by before posting to FMS, if non-zero. - logical :: v_extrinsic = .false. !< True for vertically extrinsic fields (vertically integrated). False for intrinsic (concentrations). + logical :: v_extensive = .false. !< True for vertically extensive fields (vertically integrated). False for intensive (concentrations). end type diag_type !> The following data type a list of diagnostic fields an their variants, @@ -739,7 +739,7 @@ subroutine post_data_3d(diag_field_id, field, diag_cs, is_static, mask) staggered_in_x = diag%axes%is_u_point .or. diag%axes%is_q_point staggered_in_y = diag%axes%is_v_point .or. diag%axes%is_q_point - if (diag%v_extrinsic .and. .not.diag%axes%is_native) then + if (diag%v_extensive .and. .not.diag%axes%is_native) then ! The field is vertically integrated and needs to be re-gridded if (present(mask)) then call MOM_error(FATAL,"post_data_3d: no mask for regridded field.") @@ -1013,7 +1013,7 @@ integer function register_diag_field(module_name, field_name, axes, init_time, & long_name, units, missing_value, range, mask_variant, standard_name, & verbose, do_not_log, err_msg, interp_method, tile_count, cmor_field_name, & cmor_long_name, cmor_units, cmor_standard_name, cell_methods, & - x_cell_method, y_cell_method, v_cell_method, conversion, v_extrinsic) + x_cell_method, y_cell_method, v_cell_method, conversion, v_extensive) character(len=*), intent(in) :: module_name !< Name of this module, usually "ocean_model" or "ice_shelf_model" character(len=*), intent(in) :: field_name !< Name of the diagnostic field type(axes_grp), target, intent(in) :: axes !< Container w/ up to 3 integer handles that indicates axes for this field @@ -1040,7 +1040,7 @@ integer function register_diag_field(module_name, field_name, axes, init_time, & character(len=*), optional, intent(in) :: y_cell_method !< Specifies the cell method for the y-direction. Use '' have no method. character(len=*), optional, intent(in) :: v_cell_method !< Specifies the cell method for the vertical direction. Use '' have no method. real, optional, intent(in) :: conversion !< A value to multiply data by before writing to file - logical, optional, intent(in) :: v_extrinsic !< True for vertically extrinsic fields (vertically integrated). Default/absent for intrinsic. + logical, optional, intent(in) :: v_extensive !< True for vertically extensive fields (vertically integrated). Default/absent for intensive. ! Local variables real :: MOM_missing_value type(diag_ctrl), pointer :: diag_cs @@ -1065,7 +1065,7 @@ integer function register_diag_field(module_name, field_name, axes, init_time, & cmor_units=cmor_units, cmor_standard_name=cmor_standard_name, & cell_methods=cell_methods, x_cell_method=x_cell_method, & y_cell_method=y_cell_method, v_cell_method=v_cell_method, & - conversion=conversion, v_extrinsic=v_extrinsic) + conversion=conversion, v_extensive=v_extensive) ! For each diagnostic coordinate register the diagnostic again under a different module name do i=1,diag_cs%num_diag_coords @@ -1105,7 +1105,7 @@ integer function register_diag_field(module_name, field_name, axes, init_time, & cmor_units=cmor_units, cmor_standard_name=cmor_standard_name, & cell_methods=cell_methods, x_cell_method=x_cell_method, & y_cell_method=y_cell_method, v_cell_method=v_cell_method, & - conversion=conversion, v_extrinsic=v_extrinsic) + conversion=conversion, v_extensive=v_extensive) if (active) then call diag_remap_set_active(diag_cs%diag_remap_cs(i)) endif @@ -1124,7 +1124,7 @@ logical function register_diag_field_expand_cmor(dm_id, module_name, field_name, long_name, units, missing_value, range, mask_variant, standard_name, & verbose, do_not_log, err_msg, interp_method, tile_count, cmor_field_name, & cmor_long_name, cmor_units, cmor_standard_name, cell_methods, & - x_cell_method, y_cell_method, v_cell_method, conversion, v_extrinsic) + x_cell_method, y_cell_method, v_cell_method, conversion, v_extensive) integer, intent(inout) :: dm_id !< The diag_mediator ID for this diagnostic group character(len=*), intent(in) :: module_name !< Name of this module, usually "ocean_model" or "ice_shelf_model" character(len=*), intent(in) :: field_name !< Name of the diagnostic field @@ -1152,7 +1152,7 @@ logical function register_diag_field_expand_cmor(dm_id, module_name, field_name, character(len=*), optional, intent(in) :: y_cell_method !< Specifies the cell method for the y-direction. Use '' have no method. character(len=*), optional, intent(in) :: v_cell_method !< Specifies the cell method for the vertical direction. Use '' have no method. real, optional, intent(in) :: conversion !< A value to multiply data by before writing to file - logical, optional, intent(in) :: v_extrinsic !< True for vertically extrinsic fields (vertically integrated). Default/absent for intrinsic. + logical, optional, intent(in) :: v_extensive !< True for vertically extensive fields (vertically integrated). Default/absent for intensive. ! Local variables real :: MOM_missing_value type(diag_ctrl), pointer :: diag_cs @@ -1174,7 +1174,7 @@ logical function register_diag_field_expand_cmor(dm_id, module_name, field_name, interp_method=interp_method, tile_count=tile_count) call attach_cell_methods(fms_id, axes, cm_string, & cell_methods, x_cell_method, y_cell_method, v_cell_method, & - v_extrinsic=v_extrinsic) + v_extensive=v_extensive) if (is_root_pe() .and. diag_CS%doc_unit > 0) then msg = '' if (present(cmor_field_name)) msg = 'CMOR equivalent is "'//trim(cmor_field_name)//'"' @@ -1191,7 +1191,7 @@ logical function register_diag_field_expand_cmor(dm_id, module_name, field_name, verbose=verbose, do_not_log=do_not_log, err_msg=err_msg, & interp_method=interp_method, tile_count=tile_count) call attach_cell_methods(fms_xyave_id, axes%xyave_axes, cm_string, & - cell_methods, v_cell_method, v_extrinsic=v_extrinsic) + cell_methods, v_cell_method, v_extensive=v_extensive) endif if (is_root_pe() .and. diag_CS%doc_unit > 0) then if (associated(axes%xyave_axes)) then @@ -1206,7 +1206,7 @@ logical function register_diag_field_expand_cmor(dm_id, module_name, field_name, call add_diag_to_list(diag_cs, dm_id, fms_id, this_diag, axes, module_name, field_name, msg) this_diag%fms_xyave_diag_id = fms_xyave_id - if (present(v_extrinsic)) this_diag%v_extrinsic = v_extrinsic + if (present(v_extensive)) this_diag%v_extensive = v_extensive if (present(conversion)) this_diag%conversion_factor = conversion register_diag_field_expand_cmor = .true. endif @@ -1236,7 +1236,7 @@ logical function register_diag_field_expand_cmor(dm_id, module_name, field_name, err_msg=err_msg, interp_method=interp_method, tile_count=tile_count) call attach_cell_methods(fms_id, axes, cm_string, & cell_methods, x_cell_method, y_cell_method, v_cell_method, & - v_extrinsic=v_extrinsic) + v_extensive=v_extensive) if (is_root_pe() .and. diag_CS%doc_unit > 0) then msg = 'native name is "'//trim(field_name)//'"' call log_available_diag(fms_id>0, module_name, cmor_field_name, cm_string, & @@ -1253,7 +1253,7 @@ logical function register_diag_field_expand_cmor(dm_id, module_name, field_name, standard_name=trim(posted_cmor_standard_name), verbose=verbose, do_not_log=do_not_log, & err_msg=err_msg, interp_method=interp_method, tile_count=tile_count) call attach_cell_methods(fms_xyave_id, axes%xyave_axes, cm_string, & - cell_methods, v_cell_method, v_extrinsic=v_extrinsic) + cell_methods, v_cell_method, v_extensive=v_extensive) endif if (is_root_pe() .and. diag_CS%doc_unit > 0) then if (associated(axes%xyave_axes)) then @@ -1268,7 +1268,7 @@ logical function register_diag_field_expand_cmor(dm_id, module_name, field_name, call add_diag_to_list(diag_cs, dm_id, fms_id, this_diag, axes, module_name, field_name, msg) this_diag%fms_xyave_diag_id = fms_xyave_id - if (present(v_extrinsic)) this_diag%v_extrinsic = v_extrinsic + if (present(v_extensive)) this_diag%v_extensive = v_extensive if (present(conversion)) this_diag%conversion_factor = conversion register_diag_field_expand_cmor = .true. endif @@ -1365,7 +1365,7 @@ end subroutine add_diag_to_list !> Attaches "cell_methods" attribute to a variable based on defaults for axes_grp or optional arguments. subroutine attach_cell_methods(id, axes, ostring, cell_methods, & - x_cell_method, y_cell_method, v_cell_method, v_extrinsic) + x_cell_method, y_cell_method, v_cell_method, v_extensive) integer, intent(in) :: id !< Handle to diagnostic type(axes_grp), intent(in) :: axes !< Container w/ up to 3 integer handles that indicates axes for this field character(len=*), intent(out) :: ostring !< The cell_methods strings that would appear in the file @@ -1375,14 +1375,14 @@ subroutine attach_cell_methods(id, axes, ostring, cell_methods, & character(len=*), optional, intent(in) :: x_cell_method !< Specifies the cell method for the x-direction. Use '' have no method. character(len=*), optional, intent(in) :: y_cell_method !< Specifies the cell method for the y-direction. Use '' have no method. character(len=*), optional, intent(in) :: v_cell_method !< Specifies the cell method for the vertical direction. Use '' have no method. - logical, optional, intent(in) :: v_extrinsic !< True for vertically extrinsic fields (vertically integrated). Default/absent for intrinsic. + logical, optional, intent(in) :: v_extensive !< True for vertically extensive fields (vertically integrated). Default/absent for intensive. ! Local variables character(len=9) :: axis_name ostring = '' if (present(cell_methods)) then if (present(x_cell_method) .or. present(y_cell_method) .or. present(v_cell_method) & - .or. present(v_extrinsic)) then + .or. present(v_extensive)) then call MOM_error(FATAL, "attach_cell_methods: " // & 'Individual direction cell method was specified along with a "cell_methods" string.') endif @@ -1418,8 +1418,8 @@ subroutine attach_cell_methods(id, axes, ostring, cell_methods, & endif endif if (present(v_cell_method)) then - if (present(v_extrinsic)) call MOM_error(FATAL, "attach_cell_methods: " // & - 'Vertical cell method was specified along with the vertically extrinsic flag.') + if (present(v_extensive)) call MOM_error(FATAL, "attach_cell_methods: " // & + 'Vertical cell method was specified along with the vertically extensive flag.') if (len(trim(v_cell_method))>0) then if (axes%rank==1) then call get_diag_axis_name(axes%handles(1), axis_name) @@ -1429,7 +1429,7 @@ subroutine attach_cell_methods(id, axes, ostring, cell_methods, & call diag_field_add_attribute(id, 'cell_methods', trim(axis_name)//':'//trim(v_cell_method)) ostring = trim(adjustl(ostring))//' '//trim(axis_name)//':'//trim(v_cell_method) endif - elseif (present(v_extrinsic)) then + elseif (present(v_extensive)) then if (axes%rank==1) then call get_diag_axis_name(axes%handles(1), axis_name) elseif (axes%rank==3) then