- Timestamp:
- 03/19/24 15:21:33 (11 months ago)
- Location:
- XIOS3/trunk/src
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS3/trunk/src/config/field_attribute.conf
r2600 r2617 13 13 DECLARE_ATTRIBUTE(int, level) 14 14 DECLARE_ATTRIBUTE(int, prec) 15 DECLARE_ATTRIBUTE(bool, conversion_by_ NetCDF)15 DECLARE_ATTRIBUTE(bool, conversion_by_netcdf) 16 16 DECLARE_ATTRIBUTE(StdString, expr, false) 17 17 -
XIOS3/trunk/src/interface/c_attr/icfield_attr.cpp
r2616 r2617 287 287 288 288 289 void cxios_set_field_conversion_by_ NetCDF(field_Ptr field_hdl, bool conversion_by_NetCDF)290 { 291 CTimer::get("XIOS").resume(); 292 field_hdl->conversion_by_ NetCDF.setValue(conversion_by_NetCDF);293 CTimer::get("XIOS").suspend(); 294 } 295 296 void cxios_get_field_conversion_by_ NetCDF(field_Ptr field_hdl, bool* conversion_by_NetCDF)297 { 298 CTimer::get("XIOS").resume(); 299 *conversion_by_ NetCDF = field_hdl->conversion_by_NetCDF.getInheritedValue();300 CTimer::get("XIOS").suspend(); 301 } 302 303 bool cxios_is_defined_field_conversion_by_ NetCDF(field_Ptr field_hdl)304 { 305 CTimer::get("XIOS").resume(); 306 bool isDefined = field_hdl->conversion_by_ NetCDF.hasInheritedValue();289 void cxios_set_field_conversion_by_netcdf(field_Ptr field_hdl, bool conversion_by_netcdf) 290 { 291 CTimer::get("XIOS").resume(); 292 field_hdl->conversion_by_netcdf.setValue(conversion_by_netcdf); 293 CTimer::get("XIOS").suspend(); 294 } 295 296 void cxios_get_field_conversion_by_netcdf(field_Ptr field_hdl, bool* conversion_by_netcdf) 297 { 298 CTimer::get("XIOS").resume(); 299 *conversion_by_netcdf = field_hdl->conversion_by_netcdf.getInheritedValue(); 300 CTimer::get("XIOS").suspend(); 301 } 302 303 bool cxios_is_defined_field_conversion_by_netcdf(field_Ptr field_hdl) 304 { 305 CTimer::get("XIOS").resume(); 306 bool isDefined = field_hdl->conversion_by_netcdf.hasInheritedValue(); 307 307 CTimer::get("XIOS").suspend(); 308 308 return isDefined; -
XIOS3/trunk/src/interface/c_attr/icfieldgroup_attr.cpp
r2616 r2617 287 287 288 288 289 void cxios_set_fieldgroup_conversion_by_ NetCDF(fieldgroup_Ptr fieldgroup_hdl, bool conversion_by_NetCDF)290 { 291 CTimer::get("XIOS").resume(); 292 fieldgroup_hdl->conversion_by_ NetCDF.setValue(conversion_by_NetCDF);293 CTimer::get("XIOS").suspend(); 294 } 295 296 void cxios_get_fieldgroup_conversion_by_ NetCDF(fieldgroup_Ptr fieldgroup_hdl, bool* conversion_by_NetCDF)297 { 298 CTimer::get("XIOS").resume(); 299 *conversion_by_ NetCDF = fieldgroup_hdl->conversion_by_NetCDF.getInheritedValue();300 CTimer::get("XIOS").suspend(); 301 } 302 303 bool cxios_is_defined_fieldgroup_conversion_by_ NetCDF(fieldgroup_Ptr fieldgroup_hdl)304 { 305 CTimer::get("XIOS").resume(); 306 bool isDefined = fieldgroup_hdl->conversion_by_ NetCDF.hasInheritedValue();289 void cxios_set_fieldgroup_conversion_by_netcdf(fieldgroup_Ptr fieldgroup_hdl, bool conversion_by_netcdf) 290 { 291 CTimer::get("XIOS").resume(); 292 fieldgroup_hdl->conversion_by_netcdf.setValue(conversion_by_netcdf); 293 CTimer::get("XIOS").suspend(); 294 } 295 296 void cxios_get_fieldgroup_conversion_by_netcdf(fieldgroup_Ptr fieldgroup_hdl, bool* conversion_by_netcdf) 297 { 298 CTimer::get("XIOS").resume(); 299 *conversion_by_netcdf = fieldgroup_hdl->conversion_by_netcdf.getInheritedValue(); 300 CTimer::get("XIOS").suspend(); 301 } 302 303 bool cxios_is_defined_fieldgroup_conversion_by_netcdf(fieldgroup_Ptr fieldgroup_hdl) 304 { 305 CTimer::get("XIOS").resume(); 306 bool isDefined = fieldgroup_hdl->conversion_by_netcdf.hasInheritedValue(); 307 307 CTimer::get("XIOS").suspend(); 308 308 return isDefined; -
XIOS3/trunk/src/interface/fortran_attr/field_interface_attr.F90
r2616 r2617 231 231 232 232 233 SUBROUTINE cxios_set_field_conversion_by_ NetCDF(field_hdl, conversion_by_NetCDF) BIND(C)234 USE ISO_C_BINDING 235 INTEGER (kind = C_INTPTR_T), VALUE :: field_hdl 236 LOGICAL (KIND=C_BOOL) , VALUE :: conversion_by_ NetCDF237 END SUBROUTINE cxios_set_field_conversion_by_ NetCDF238 239 SUBROUTINE cxios_get_field_conversion_by_ NetCDF(field_hdl, conversion_by_NetCDF) BIND(C)240 USE ISO_C_BINDING 241 INTEGER (kind = C_INTPTR_T), VALUE :: field_hdl 242 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF243 END SUBROUTINE cxios_get_field_conversion_by_ NetCDF244 245 FUNCTION cxios_is_defined_field_conversion_by_ NetCDF(field_hdl) BIND(C)246 USE ISO_C_BINDING 247 LOGICAL(kind=C_BOOL) :: cxios_is_defined_field_conversion_by_ NetCDF248 INTEGER (kind = C_INTPTR_T), VALUE :: field_hdl 249 END FUNCTION cxios_is_defined_field_conversion_by_ NetCDF233 SUBROUTINE cxios_set_field_conversion_by_netcdf(field_hdl, conversion_by_netcdf) BIND(C) 234 USE ISO_C_BINDING 235 INTEGER (kind = C_INTPTR_T), VALUE :: field_hdl 236 LOGICAL (KIND=C_BOOL) , VALUE :: conversion_by_netcdf 237 END SUBROUTINE cxios_set_field_conversion_by_netcdf 238 239 SUBROUTINE cxios_get_field_conversion_by_netcdf(field_hdl, conversion_by_netcdf) BIND(C) 240 USE ISO_C_BINDING 241 INTEGER (kind = C_INTPTR_T), VALUE :: field_hdl 242 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf 243 END SUBROUTINE cxios_get_field_conversion_by_netcdf 244 245 FUNCTION cxios_is_defined_field_conversion_by_netcdf(field_hdl) BIND(C) 246 USE ISO_C_BINDING 247 LOGICAL(kind=C_BOOL) :: cxios_is_defined_field_conversion_by_netcdf 248 INTEGER (kind = C_INTPTR_T), VALUE :: field_hdl 249 END FUNCTION cxios_is_defined_field_conversion_by_netcdf 250 250 251 251 -
XIOS3/trunk/src/interface/fortran_attr/fieldgroup_interface_attr.F90
r2616 r2617 231 231 232 232 233 SUBROUTINE cxios_set_fieldgroup_conversion_by_ NetCDF(fieldgroup_hdl, conversion_by_NetCDF) BIND(C)234 USE ISO_C_BINDING 235 INTEGER (kind = C_INTPTR_T), VALUE :: fieldgroup_hdl 236 LOGICAL (KIND=C_BOOL) , VALUE :: conversion_by_ NetCDF237 END SUBROUTINE cxios_set_fieldgroup_conversion_by_ NetCDF238 239 SUBROUTINE cxios_get_fieldgroup_conversion_by_ NetCDF(fieldgroup_hdl, conversion_by_NetCDF) BIND(C)240 USE ISO_C_BINDING 241 INTEGER (kind = C_INTPTR_T), VALUE :: fieldgroup_hdl 242 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF243 END SUBROUTINE cxios_get_fieldgroup_conversion_by_ NetCDF244 245 FUNCTION cxios_is_defined_fieldgroup_conversion_by_ NetCDF(fieldgroup_hdl) BIND(C)246 USE ISO_C_BINDING 247 LOGICAL(kind=C_BOOL) :: cxios_is_defined_fieldgroup_conversion_by_ NetCDF248 INTEGER (kind = C_INTPTR_T), VALUE :: fieldgroup_hdl 249 END FUNCTION cxios_is_defined_fieldgroup_conversion_by_ NetCDF233 SUBROUTINE cxios_set_fieldgroup_conversion_by_netcdf(fieldgroup_hdl, conversion_by_netcdf) BIND(C) 234 USE ISO_C_BINDING 235 INTEGER (kind = C_INTPTR_T), VALUE :: fieldgroup_hdl 236 LOGICAL (KIND=C_BOOL) , VALUE :: conversion_by_netcdf 237 END SUBROUTINE cxios_set_fieldgroup_conversion_by_netcdf 238 239 SUBROUTINE cxios_get_fieldgroup_conversion_by_netcdf(fieldgroup_hdl, conversion_by_netcdf) BIND(C) 240 USE ISO_C_BINDING 241 INTEGER (kind = C_INTPTR_T), VALUE :: fieldgroup_hdl 242 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf 243 END SUBROUTINE cxios_get_fieldgroup_conversion_by_netcdf 244 245 FUNCTION cxios_is_defined_fieldgroup_conversion_by_netcdf(fieldgroup_hdl) BIND(C) 246 USE ISO_C_BINDING 247 LOGICAL(kind=C_BOOL) :: cxios_is_defined_fieldgroup_conversion_by_netcdf 248 INTEGER (kind = C_INTPTR_T), VALUE :: fieldgroup_hdl 249 END FUNCTION cxios_is_defined_fieldgroup_conversion_by_netcdf 250 250 251 251 -
XIOS3/trunk/src/interface/fortran_attr/ifield_attr.F90
r2616 r2617 14 14 ( field_id, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 15 15 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 16 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &16 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 17 17 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 18 18 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 35 35 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: compression_params(:) 36 36 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: compression_type 37 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_ NetCDF38 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF_tmp37 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_netcdf 38 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf_tmp 39 39 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value 40 40 LOGICAL , OPTIONAL, INTENT(IN) :: detect_missing_value … … 73 73 ( field_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 74 74 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 75 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &75 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 76 76 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 77 77 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 83 83 ( field_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 84 84 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 85 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &85 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 86 86 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 87 87 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 103 103 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: compression_params(:) 104 104 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: compression_type 105 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_ NetCDF106 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF_tmp105 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_netcdf 106 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf_tmp 107 107 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value 108 108 LOGICAL , OPTIONAL, INTENT(IN) :: detect_missing_value … … 139 139 ( field_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 140 140 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 141 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &141 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 142 142 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 143 143 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 149 149 ( field_hdl, add_offset_, axis_ref_, build_workflow_graph_, cell_methods_, cell_methods_mode_ & 150 150 , check_if_active_, chunking_blocksize_target_, comment_, compression_level_, compression_params_ & 151 , compression_type_, conversion_by_ NetCDF_, default_value_, detect_missing_value_, domain_ref_ &151 , compression_type_, conversion_by_netcdf_, default_value_, detect_missing_value_, domain_ref_ & 152 152 , enabled_, expr_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, indexed_output_ & 153 153 , level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_ & … … 169 169 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: compression_params_(:) 170 170 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: compression_type_ 171 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_ NetCDF_172 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF__tmp171 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_netcdf_ 172 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf__tmp 173 173 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value_ 174 174 LOGICAL , OPTIONAL, INTENT(IN) :: detect_missing_value_ … … 259 259 ENDIF 260 260 261 IF (PRESENT(conversion_by_ NetCDF_)) THEN262 conversion_by_ NetCDF__tmp = conversion_by_NetCDF_263 CALL cxios_set_field_conversion_by_ NetCDF&264 (field_hdl%daddr, conversion_by_ NetCDF__tmp)261 IF (PRESENT(conversion_by_netcdf_)) THEN 262 conversion_by_netcdf__tmp = conversion_by_netcdf_ 263 CALL cxios_set_field_conversion_by_netcdf & 264 (field_hdl%daddr, conversion_by_netcdf__tmp) 265 265 ENDIF 266 266 … … 400 400 ( field_id, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 401 401 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 402 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &402 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 403 403 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 404 404 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 421 421 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: compression_params(:) 422 422 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: compression_type 423 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF424 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF_tmp423 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_netcdf 424 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf_tmp 425 425 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value 426 426 LOGICAL , OPTIONAL, INTENT(OUT) :: detect_missing_value … … 459 459 ( field_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 460 460 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 461 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &461 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 462 462 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 463 463 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 469 469 ( field_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 470 470 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 471 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &471 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 472 472 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 473 473 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 489 489 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: compression_params(:) 490 490 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: compression_type 491 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF492 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF_tmp491 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_netcdf 492 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf_tmp 493 493 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value 494 494 LOGICAL , OPTIONAL, INTENT(OUT) :: detect_missing_value … … 525 525 ( field_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 526 526 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 527 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &527 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 528 528 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 529 529 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 535 535 ( field_hdl, add_offset_, axis_ref_, build_workflow_graph_, cell_methods_, cell_methods_mode_ & 536 536 , check_if_active_, chunking_blocksize_target_, comment_, compression_level_, compression_params_ & 537 , compression_type_, conversion_by_ NetCDF_, default_value_, detect_missing_value_, domain_ref_ &537 , compression_type_, conversion_by_netcdf_, default_value_, detect_missing_value_, domain_ref_ & 538 538 , enabled_, expr_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, indexed_output_ & 539 539 , level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_ & … … 555 555 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: compression_params_(:) 556 556 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: compression_type_ 557 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF_558 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF__tmp557 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_netcdf_ 558 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf__tmp 559 559 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value_ 560 560 LOGICAL , OPTIONAL, INTENT(OUT) :: detect_missing_value_ … … 645 645 ENDIF 646 646 647 IF (PRESENT(conversion_by_ NetCDF_)) THEN648 CALL cxios_get_field_conversion_by_ NetCDF&649 (field_hdl%daddr, conversion_by_ NetCDF__tmp)650 conversion_by_ NetCDF_ = conversion_by_NetCDF__tmp647 IF (PRESENT(conversion_by_netcdf_)) THEN 648 CALL cxios_get_field_conversion_by_netcdf & 649 (field_hdl%daddr, conversion_by_netcdf__tmp) 650 conversion_by_netcdf_ = conversion_by_netcdf__tmp 651 651 ENDIF 652 652 … … 786 786 ( field_id, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 787 787 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 788 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &788 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 789 789 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 790 790 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 816 816 LOGICAL, OPTIONAL, INTENT(OUT) :: compression_type 817 817 LOGICAL(KIND=C_BOOL) :: compression_type_tmp 818 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF819 LOGICAL(KIND=C_BOOL) :: conversion_by_ NetCDF_tmp818 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_netcdf 819 LOGICAL(KIND=C_BOOL) :: conversion_by_netcdf_tmp 820 820 LOGICAL, OPTIONAL, INTENT(OUT) :: default_value 821 821 LOGICAL(KIND=C_BOOL) :: default_value_tmp … … 874 874 ( field_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 875 875 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 876 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &876 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 877 877 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 878 878 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 884 884 ( field_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 885 885 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 886 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &886 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 887 887 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 888 888 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 913 913 LOGICAL, OPTIONAL, INTENT(OUT) :: compression_type 914 914 LOGICAL(KIND=C_BOOL) :: compression_type_tmp 915 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF916 LOGICAL(KIND=C_BOOL) :: conversion_by_ NetCDF_tmp915 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_netcdf 916 LOGICAL(KIND=C_BOOL) :: conversion_by_netcdf_tmp 917 917 LOGICAL, OPTIONAL, INTENT(OUT) :: default_value 918 918 LOGICAL(KIND=C_BOOL) :: default_value_tmp … … 969 969 ( field_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode, check_if_active & 970 970 , chunking_blocksize_target, comment, compression_level, compression_params, compression_type & 971 , conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref &971 , conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref & 972 972 , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation & 973 973 , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit & … … 979 979 ( field_hdl, add_offset_, axis_ref_, build_workflow_graph_, cell_methods_, cell_methods_mode_ & 980 980 , check_if_active_, chunking_blocksize_target_, comment_, compression_level_, compression_params_ & 981 , compression_type_, conversion_by_ NetCDF_, default_value_, detect_missing_value_, domain_ref_ &981 , compression_type_, conversion_by_netcdf_, default_value_, detect_missing_value_, domain_ref_ & 982 982 , enabled_, expr_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, indexed_output_ & 983 983 , level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_ & … … 1008 1008 LOGICAL, OPTIONAL, INTENT(OUT) :: compression_type_ 1009 1009 LOGICAL(KIND=C_BOOL) :: compression_type__tmp 1010 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF_1011 LOGICAL(KIND=C_BOOL) :: conversion_by_ NetCDF__tmp1010 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_netcdf_ 1011 LOGICAL(KIND=C_BOOL) :: conversion_by_netcdf__tmp 1012 1012 LOGICAL, OPTIONAL, INTENT(OUT) :: default_value_ 1013 1013 LOGICAL(KIND=C_BOOL) :: default_value__tmp … … 1127 1127 ENDIF 1128 1128 1129 IF (PRESENT(conversion_by_ NetCDF_)) THEN1130 conversion_by_ NetCDF__tmp = cxios_is_defined_field_conversion_by_NetCDF&1131 (field_hdl%daddr) 1132 conversion_by_ NetCDF_ = conversion_by_NetCDF__tmp1129 IF (PRESENT(conversion_by_netcdf_)) THEN 1130 conversion_by_netcdf__tmp = cxios_is_defined_field_conversion_by_netcdf & 1131 (field_hdl%daddr) 1132 conversion_by_netcdf_ = conversion_by_netcdf__tmp 1133 1133 ENDIF 1134 1134 -
XIOS3/trunk/src/interface/fortran_attr/ifieldgroup_attr.F90
r2616 r2617 14 14 ( fieldgroup_id, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 15 15 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 16 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &16 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 17 17 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 18 18 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 35 35 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: compression_params(:) 36 36 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: compression_type 37 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_ NetCDF38 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF_tmp37 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_netcdf 38 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf_tmp 39 39 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value 40 40 LOGICAL , OPTIONAL, INTENT(IN) :: detect_missing_value … … 74 74 ( fieldgroup_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 75 75 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 76 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &76 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 77 77 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 78 78 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 84 84 ( fieldgroup_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 85 85 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 86 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &86 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 87 87 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 88 88 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 104 104 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: compression_params(:) 105 105 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: compression_type 106 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_ NetCDF107 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF_tmp106 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_netcdf 107 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf_tmp 108 108 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value 109 109 LOGICAL , OPTIONAL, INTENT(IN) :: detect_missing_value … … 141 141 ( fieldgroup_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 142 142 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 143 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &143 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 144 144 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 145 145 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 151 151 ( fieldgroup_hdl, add_offset_, axis_ref_, build_workflow_graph_, cell_methods_, cell_methods_mode_ & 152 152 , check_if_active_, chunking_blocksize_target_, comment_, compression_level_, compression_params_ & 153 , compression_type_, conversion_by_ NetCDF_, default_value_, detect_missing_value_, domain_ref_ &153 , compression_type_, conversion_by_netcdf_, default_value_, detect_missing_value_, domain_ref_ & 154 154 , enabled_, expr_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, group_ref_, indexed_output_ & 155 155 , level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_ & … … 171 171 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: compression_params_(:) 172 172 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: compression_type_ 173 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_ NetCDF_174 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF__tmp173 LOGICAL , OPTIONAL, INTENT(IN) :: conversion_by_netcdf_ 174 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf__tmp 175 175 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value_ 176 176 LOGICAL , OPTIONAL, INTENT(IN) :: detect_missing_value_ … … 262 262 ENDIF 263 263 264 IF (PRESENT(conversion_by_ NetCDF_)) THEN265 conversion_by_ NetCDF__tmp = conversion_by_NetCDF_266 CALL cxios_set_fieldgroup_conversion_by_ NetCDF&267 (fieldgroup_hdl%daddr, conversion_by_ NetCDF__tmp)264 IF (PRESENT(conversion_by_netcdf_)) THEN 265 conversion_by_netcdf__tmp = conversion_by_netcdf_ 266 CALL cxios_set_fieldgroup_conversion_by_netcdf & 267 (fieldgroup_hdl%daddr, conversion_by_netcdf__tmp) 268 268 ENDIF 269 269 … … 408 408 ( fieldgroup_id, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 409 409 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 410 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &410 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 411 411 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 412 412 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 429 429 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: compression_params(:) 430 430 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: compression_type 431 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF432 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF_tmp431 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_netcdf 432 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf_tmp 433 433 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value 434 434 LOGICAL , OPTIONAL, INTENT(OUT) :: detect_missing_value … … 468 468 ( fieldgroup_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 469 469 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 470 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &470 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 471 471 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 472 472 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 478 478 ( fieldgroup_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 479 479 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 480 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &480 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 481 481 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 482 482 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 498 498 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: compression_params(:) 499 499 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: compression_type 500 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF501 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF_tmp500 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_netcdf 501 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf_tmp 502 502 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value 503 503 LOGICAL , OPTIONAL, INTENT(OUT) :: detect_missing_value … … 535 535 ( fieldgroup_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 536 536 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 537 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &537 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 538 538 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 539 539 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 545 545 ( fieldgroup_hdl, add_offset_, axis_ref_, build_workflow_graph_, cell_methods_, cell_methods_mode_ & 546 546 , check_if_active_, chunking_blocksize_target_, comment_, compression_level_, compression_params_ & 547 , compression_type_, conversion_by_ NetCDF_, default_value_, detect_missing_value_, domain_ref_ &547 , compression_type_, conversion_by_netcdf_, default_value_, detect_missing_value_, domain_ref_ & 548 548 , enabled_, expr_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, group_ref_, indexed_output_ & 549 549 , level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_ & … … 565 565 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: compression_params_(:) 566 566 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: compression_type_ 567 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF_568 LOGICAL (KIND=C_BOOL) :: conversion_by_ NetCDF__tmp567 LOGICAL , OPTIONAL, INTENT(OUT) :: conversion_by_netcdf_ 568 LOGICAL (KIND=C_BOOL) :: conversion_by_netcdf__tmp 569 569 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value_ 570 570 LOGICAL , OPTIONAL, INTENT(OUT) :: detect_missing_value_ … … 656 656 ENDIF 657 657 658 IF (PRESENT(conversion_by_ NetCDF_)) THEN659 CALL cxios_get_fieldgroup_conversion_by_ NetCDF&660 (fieldgroup_hdl%daddr, conversion_by_ NetCDF__tmp)661 conversion_by_ NetCDF_ = conversion_by_NetCDF__tmp658 IF (PRESENT(conversion_by_netcdf_)) THEN 659 CALL cxios_get_fieldgroup_conversion_by_netcdf & 660 (fieldgroup_hdl%daddr, conversion_by_netcdf__tmp) 661 conversion_by_netcdf_ = conversion_by_netcdf__tmp 662 662 ENDIF 663 663 … … 802 802 ( fieldgroup_id, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 803 803 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 804 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &804 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 805 805 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 806 806 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 832 832 LOGICAL, OPTIONAL, INTENT(OUT) :: compression_type 833 833 LOGICAL(KIND=C_BOOL) :: compression_type_tmp 834 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF835 LOGICAL(KIND=C_BOOL) :: conversion_by_ NetCDF_tmp834 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_netcdf 835 LOGICAL(KIND=C_BOOL) :: conversion_by_netcdf_tmp 836 836 LOGICAL, OPTIONAL, INTENT(OUT) :: default_value 837 837 LOGICAL(KIND=C_BOOL) :: default_value_tmp … … 892 892 ( fieldgroup_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 893 893 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 894 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &894 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 895 895 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 896 896 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 902 902 ( fieldgroup_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 903 903 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 904 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &904 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 905 905 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 906 906 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 931 931 LOGICAL, OPTIONAL, INTENT(OUT) :: compression_type 932 932 LOGICAL(KIND=C_BOOL) :: compression_type_tmp 933 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF934 LOGICAL(KIND=C_BOOL) :: conversion_by_ NetCDF_tmp933 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_netcdf 934 LOGICAL(KIND=C_BOOL) :: conversion_by_netcdf_tmp 935 935 LOGICAL, OPTIONAL, INTENT(OUT) :: default_value 936 936 LOGICAL(KIND=C_BOOL) :: default_value_tmp … … 989 989 ( fieldgroup_hdl, add_offset, axis_ref, build_workflow_graph, cell_methods, cell_methods_mode & 990 990 , check_if_active, chunking_blocksize_target, comment, compression_level, compression_params & 991 , compression_type, conversion_by_ NetCDF, default_value, detect_missing_value, domain_ref, enabled &991 , compression_type, conversion_by_netcdf, default_value, detect_missing_value, domain_ref, enabled & 992 992 , expr, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output, level & 993 993 , long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled & … … 999 999 ( fieldgroup_hdl, add_offset_, axis_ref_, build_workflow_graph_, cell_methods_, cell_methods_mode_ & 1000 1000 , check_if_active_, chunking_blocksize_target_, comment_, compression_level_, compression_params_ & 1001 , compression_type_, conversion_by_ NetCDF_, default_value_, detect_missing_value_, domain_ref_ &1001 , compression_type_, conversion_by_netcdf_, default_value_, detect_missing_value_, domain_ref_ & 1002 1002 , enabled_, expr_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, group_ref_, indexed_output_ & 1003 1003 , level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_ & … … 1028 1028 LOGICAL, OPTIONAL, INTENT(OUT) :: compression_type_ 1029 1029 LOGICAL(KIND=C_BOOL) :: compression_type__tmp 1030 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_ NetCDF_1031 LOGICAL(KIND=C_BOOL) :: conversion_by_ NetCDF__tmp1030 LOGICAL, OPTIONAL, INTENT(OUT) :: conversion_by_netcdf_ 1031 LOGICAL(KIND=C_BOOL) :: conversion_by_netcdf__tmp 1032 1032 LOGICAL, OPTIONAL, INTENT(OUT) :: default_value_ 1033 1033 LOGICAL(KIND=C_BOOL) :: default_value__tmp … … 1149 1149 ENDIF 1150 1150 1151 IF (PRESENT(conversion_by_ NetCDF_)) THEN1152 conversion_by_ NetCDF__tmp = cxios_is_defined_fieldgroup_conversion_by_NetCDF&1153 (fieldgroup_hdl%daddr) 1154 conversion_by_ NetCDF_ = conversion_by_NetCDF__tmp1151 IF (PRESENT(conversion_by_netcdf_)) THEN 1152 conversion_by_netcdf__tmp = cxios_is_defined_fieldgroup_conversion_by_netcdf & 1153 (fieldgroup_hdl%daddr) 1154 conversion_by_netcdf_ = conversion_by_netcdf__tmp 1155 1155 ENDIF 1156 1156 -
XIOS3/trunk/src/io/nc4_data_output.cpp
r2613 r2617 2491 2491 2492 2492 bool conversionByNetCDF = true; // default : conversion operated by NetCDF for now (legacy behaviour) 2493 if (!field->conversion_by_ NetCDF.isEmpty())2494 { 2495 // use conversion_by_ NetCDF= ".false." to bypass NetCDF conversion2493 if (!field->conversion_by_netcdf.isEmpty()) 2494 { 2495 // use conversion_by_netcdf = ".false." to bypass NetCDF conversion 2496 2496 // poor performances from NC_DOUBLE to NC_FLOAT with isgreater/isless in recent NetCDF available at TGCC 2497 conversionByNetCDF = field->conversion_by_ NetCDF;2497 conversionByNetCDF = field->conversion_by_netcdf; 2498 2498 } 2499 2499 if ( ( type == NC_DOUBLE ) || ( conversionByNetCDF ) )
Note: See TracChangeset
for help on using the changeset viewer.