Changeset 576
- Timestamp:
- 03/13/15 17:49:10 (10 years ago)
- Location:
- XIOS
- Files:
-
- 2 added
- 1 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/branchs/xios-1.0/src/test/parse_xml.f90
r573 r576 11 11 12 12 END PROGRAM parse_xml 13 14 15 16 17 -
XIOS/trunk/src/interface/c/icdata.cpp
r510 r576 39 39 40 40 // -------------------- Traitement des données ------------------------------ 41 42 // This function is not exported to the public Fortran interface, 43 // it is only used from the parse_xml.exe standalone test tool. 44 void cxios_init(void) 45 { 46 CXios::initialize(); 47 } 48 41 49 void cxios_init_server(void) 42 50 { -
XIOS/trunk/src/interface/fortran/date_interface.F90
r549 r576 3 3 MODULE DATE_INTERFACE 4 4 USE, INTRINSIC :: ISO_C_BINDING 5 USE IDURATION, only : txios(duration) 5 6 6 7 TYPE, BIND(C) :: txios(date) 7 8 INTEGER(kind = C_INT) :: year, month, day, hour, minute, second 8 9 END TYPE txios(date) 10 11 PRIVATE :: txios(duration) 9 12 10 13 INTERFACE ! Ne pas appeler directement/Interface FORTRAN 2003 <-> C99 … … 18 21 TYPE(txios(date)) FUNCTION cxios_date_add_duration(date, dur) BIND(C) 19 22 USE ISO_C_BINDING 20 USE IDURATION, only : txios(duration)21 23 IMPORT :: txios(date) 24 IMPORT :: txios(duration) 22 25 TYPE(txios(date)), VALUE :: date 23 26 TYPE(txios(duration)), VALUE :: dur … … 26 29 TYPE(txios(date)) FUNCTION cxios_date_sub_duration(date, dur) BIND(C) 27 30 USE ISO_C_BINDING 28 USE IDURATION, only : txios(duration)29 31 IMPORT :: txios(date) 32 IMPORT :: txios(duration) 30 33 TYPE(txios(date)), VALUE :: date 31 34 TYPE(txios(duration)), VALUE :: dur … … 34 37 TYPE(txios(duration)) FUNCTION cxios_date_sub(date1, date2) BIND(C) 35 38 USE ISO_C_BINDING 36 USE IDURATION, only : txios(duration)37 39 IMPORT :: txios(date) 40 IMPORT :: txios(duration) 38 41 TYPE(txios(date)), VALUE :: date1, date2 39 42 END FUNCTION cxios_date_sub -
XIOS/trunk/src/interface/fortran/ixios.F90
r549 r576 3 3 MODULE XIOS 4 4 5 USE icalendar, ONLY : xios(define_calendar), xios(set_timestep), xios(set_start_date), xios(set_time_origin), &5 USE icalendar, ONLY : xios(define_calendar), xios(set_timestep), xios(set_start_date), xios(set_time_origin), & 6 6 xios(get_calendar_type), xios(get_timestep), xios(get_start_date), xios(get_time_origin), & 7 xios(update_calendar), xios(get_current_date), &7 xios(update_calendar), xios(get_current_date), & 8 8 xios(get_year_length_in_seconds), xios(get_day_length_in_seconds) 9 9 10 USE icontext, ONLY : txios(context), xios(get_context_handle), xios(set_current_context), & 11 xios(is_valid_context) 10 USE icontext, ONLY : txios(context), xios(set_current_context), xios(is_valid_context) 12 11 13 USE icontext_attr, ONLY : xios(set_context_attr), xios(set_context_attr_hdl), & 14 xios(get_context_attr), xios(get_context_attr_hdl), & 15 xios(is_defined_context_attr), xios(is_defined_context_attr_hdl) 12 USE icontext_attr, ONLY : xios(set_context_attr), xios(get_context_attr), xios(is_defined_context_attr) 16 13 17 USE idata, ONLY : xios(initialize),xios(init_server), xios(finalize), xios(context_initialize), & 18 xios(context_is_initialized), xios(close_context_definition),xios(solve_inheritance), & 19 xios(context_finalize), xios(send_field_r8_1d), xios(send_field_r8_2d), & 20 xios(send_field_r8_3d), xios(send_field_r4_1d), xios(send_field_r4_2d), & 21 xios(send_field_r4_3d), xios(getVar_k8), xios(getVar_k4), xios(getVar_int), & 22 xios(getVar_logic), xios(getVar_char), xios(setVar_k8), xios(setVar_k4), xios(setVar_int), & 23 xios(setVar_logic), xios(setVar_char) 14 USE idata, ONLY : xios(initialize), xios(init_server), xios(finalize), xios(context_initialize), xios(context_is_initialized), & 15 xios(close_context_definition), xios(context_finalize), xios(solve_inheritance) 24 16 25 USE idate, ONLY : txios(date), & 26 xios(date_convert_to_seconds), & 27 xios(date_add_duration), xios(date_sub_duration), xios(date_sub), & 28 xios(date_eq), xios(date_neq), xios(date_lt), xios(date_le), xios(date_gt), xios(date_ge), & 17 USE idomain, ONLY : txios(domain), txios(domaingroup), xios(is_valid_domain), xios(is_valid_domaingroup) 18 19 USE idomain_attr, ONLY : xios(set_domain_attr), xios(get_domain_attr), xios(is_defined_domain_attr) 20 21 USE idomaingroup_attr, ONLY : xios(set_domaingroup_attr), xios(get_domaingroup_attr), xios(is_defined_domaingroup_attr) 22 23 USE iduration, ONLY: txios(duration), & 24 xios(year), xios(month), xios(day), xios(hour), xios(minute), xios(second), xios(timestep), & 25 xios(duration_add), xios(duration_sub), xios(duration_mult), xios(duration_neg), & 26 xios(duration_eq), xios(duration_neq), & 27 OPERATOR(+), OPERATOR(-), OPERATOR(*) 28 29 USE idate, ONLY : txios(date), & 30 xios(date_convert_to_seconds), & 31 xios(date_add_duration), xios(date_sub_duration), xios(date_sub), & 32 xios(date_eq), xios(date_neq), xios(date_lt), xios(date_le), xios(date_gt), xios(date_ge), & 29 33 xios(date_get_second_of_year), xios(date_get_day_of_year), xios(date_get_fraction_of_year), & 30 xios(date_get_second_of_day), xios(date_get_fraction_of_day), &31 OPERATOR(+), OPERATOR(-), &32 OPERATOR(==), OPERATOR(/=), OPERATOR(<), OPERATOR(<=), OPERATOR(>), OPERATOR(>=), &34 xios(date_get_second_of_day), xios(date_get_fraction_of_day), & 35 OPERATOR(+), OPERATOR(-), & 36 OPERATOR(==), OPERATOR(/=), OPERATOR(<), OPERATOR(<=), OPERATOR(>), OPERATOR(>=), & 33 37 ASSIGNMENT(=) 34 38 35 USE idomain, ONLY : txios(domain), txios(domaingroup), xios(get_domain_handle), & 36 xios(get_domaingroup_handle),xios(is_valid_domain), & 37 xios(is_valid_domaingroup) 39 USE ifield, ONLY : txios(field), txios(fieldgroup), xios(is_valid_field), xios(is_valid_fieldgroup) 38 40 39 USE idomain_attr, ONLY : xios(set_domain_attr), xios(set_domain_attr_hdl), & 40 xios(get_domain_attr), xios(get_domain_attr_hdl), & 41 xios(is_defined_domain_attr), xios(is_defined_domain_attr_hdl) 41 USE ifield_attr, ONLY : xios(set_field_attr), xios(get_field_attr), xios(is_defined_field_attr) 42 42 43 USE idomaingroup_attr, ONLY : xios(set_domaingroup_attr), xios(set_domaingroup_attr_hdl), & 44 xios(get_domaingroup_attr), xios(get_domaingroup_attr_hdl), & 45 xios(is_defined_domaingroup_attr), xios(is_defined_domaingroup_attr_hdl) 43 USE ifieldgroup_attr, ONLY : xios(set_fieldgroup_attr), xios(get_fieldgroup_attr), xios(is_defined_fieldgroup_attr) 46 44 47 USE iduration, ONLY: txios(duration), & 48 xios(year), xios(month), xios(day), xios(hour), xios(minute), xios(second), xios(timestep), & 49 xios(duration_add), xios(duration_sub), xios(duration_mult), xios(duration_neg), & 50 xios(duration_eq), xios(duration_neq), & 51 OPERATOR(+), OPERATOR(-), OPERATOR(*) 45 USE ivariable, ONLY : txios(variable), txios(variablegroup), xios(is_valid_variable), xios(is_valid_variablegroup) 52 46 53 USE ifield, ONLY : txios(field), txios(fieldgroup), xios(get_field_handle), & 54 xios(get_fieldgroup_handle), xios(is_valid_field), & 55 xios(is_valid_fieldgroup),xios(field_is_active_id),xios(field_is_active_hdl) 47 USE ivariable_attr, ONLY : xios(set_variable_attr), xios(get_variable_attr), xios(is_defined_variable_attr) 56 48 57 USE ifield_attr, ONLY : xios(set_field_attr),xios(set_field_attr_hdl), & 58 xios(get_field_attr),xios(get_field_attr_hdl), & 59 xios(is_defined_field_attr),xios(is_defined_field_attr_hdl) 49 USE ivariablegroup_attr, ONLY : xios(set_variablegroup_attr), xios(get_variablegroup_attr), xios(is_defined_variablegroup_attr) 60 50 61 USE ifieldgroup_attr, ONLY : xios(set_fieldgroup_attr), xios(set_fieldgroup_attr_hdl), & 62 xios(get_fieldgroup_attr), xios(get_fieldgroup_attr_hdl), & 63 xios(is_defined_fieldgroup_attr), xios(is_defined_fieldgroup_attr_hdl) 51 USE ifile, ONLY : txios(file), txios(filegroup), xios(is_valid_file), xios(is_valid_filegroup) 64 52 65 USE ivariable, ONLY : txios(variable), txios(variablegroup), xios(get_variable_handle), & 66 xios(get_variablegroup_handle), xios(is_valid_variable), & 67 xios(is_valid_variablegroup) 53 USE ifile_attr, ONLY : xios(set_file_attr), xios(get_file_attr), xios(is_defined_file_attr) 68 54 69 USE ivariable_attr, ONLY : xios(set_variable_attr),xios(set_variable_attr_hdl), & 70 xios(get_variable_attr),xios(get_variable_attr_hdl), & 71 xios(is_defined_variable_attr),xios(is_defined_variable_attr_hdl) 55 USE ifilegroup_attr, ONLY : xios(set_filegroup_attr), xios(get_filegroup_attr), xios(is_defined_filegroup_attr) 72 56 73 USE ivariablegroup_attr, ONLY : xios(set_variablegroup_attr), xios(set_variablegroup_attr_hdl), & 74 xios(get_variablegroup_attr), xios(get_variablegroup_attr_hdl), & 75 xios(is_defined_variablegroup_attr), xios(is_defined_variablegroup_attr_hdl) 57 USE igrid, ONLY : txios(grid), txios(gridgroup), xios(is_valid_grid), xios(is_valid_gridgroup) 76 58 77 USE ifile, ONLY : txios(file), txios(filegroup), xios(get_file_handle), & 78 xios(get_filegroup_handle), xios(is_valid_file), xios(is_valid_filegroup) 59 USE igrid_attr, ONLY : xios(set_grid_attr), xios(get_grid_attr), xios(is_defined_grid_attr) 79 60 80 USE ifile_attr, ONLY : xios(set_file_attr),xios(set_file_attr_hdl), & 81 xios(get_file_attr),xios(get_file_attr_hdl), & 82 xios(is_defined_file_attr),xios(is_defined_file_attr_hdl) 61 USE igridgroup_attr, ONLY : xios(set_gridgroup_attr), xios(get_gridgroup_attr), xios(is_defined_gridgroup_attr) 83 62 84 USE ifilegroup_attr, ONLY : xios(set_filegroup_attr), xios(set_filegroup_attr_hdl), & 85 xios(get_filegroup_attr), xios(get_filegroup_attr_hdl), & 86 xios(is_defined_filegroup_attr), xios(is_defined_filegroup_attr_hdl) 63 USE iaxis, ONLY : txios(axis), txios(axisgroup), xios(is_valid_axis), xios(is_valid_axisgroup) 87 64 88 USE igrid, ONLY : txios(grid), txios(gridgroup), xios(get_grid_handle), & 89 xios(get_gridgroup_handle), xios(is_valid_grid), xios(is_valid_gridgroup) 65 USE iaxis_attr, ONLY : xios(set_axis_attr), xios(get_axis_attr), xios(is_defined_axis_attr) 90 66 91 USE igrid_attr, ONLY : xios(set_grid_attr_hdl), xios(set_grid_attr), & 92 xios(get_grid_attr_hdl), xios(get_grid_attr), & 93 xios(is_defined_grid_attr_hdl), xios(is_defined_grid_attr) 67 USE iaxisgroup_attr, ONLY : xios(set_axisgroup_attr), xios(get_axisgroup_attr), xios(is_defined_axisgroup_attr) 94 68 95 USE igridgroup_attr, ONLY : xios(set_gridgroup_attr), xios(set_gridgroup_attr_hdl), & 96 xios(get_gridgroup_attr), xios(get_gridgroup_attr_hdl), & 97 xios(is_defined_gridgroup_attr), xios(is_defined_gridgroup_attr_hdl) 98 99 USE iaxis, ONLY : txios(axis), txios(axisgroup), xios(get_axis_handle), & 100 xios(get_axisgroup_handle), xios(is_valid_axis), xios(is_valid_axisgroup) 101 102 USE iaxis_attr, ONLY : xios(set_axis_attr), xios(set_axis_attr_hdl), & 103 xios(get_axis_attr), xios(get_axis_attr_hdl), & 104 xios(is_defined_axis_attr), xios(is_defined_axis_attr_hdl) 105 106 USE iaxisgroup_attr, ONLY : xios(set_axisgroup_attr), xios(set_axisgroup_attr_hdl), & 107 xios(get_axisgroup_attr), xios(get_axisgroup_attr_hdl), & 108 xios(is_defined_axisgroup_attr), xios(is_defined_axisgroup_attr_hdl) 109 110 USE ixml_tree, ONLY : xios(add_axis), xios(add_file), xios(add_grid), xios(add_field), xios(add_domain), & 111 xios(add_fieldtofile), xios(add_variabletofile), xios(add_variabletofield), & 112 xios(add_axisgroup), xios(add_filegroup), xios(add_gridgroup), xios(add_fieldgroup), & 113 xios(add_domaingroup), xios(add_fieldgrouptofile), xios(add_variablegrouptofile), & 114 xios(add_variablegrouptofield) 115 116 PRIVATE 117 118 119 INTERFACE xios(set_attr) 120 MODULE PROCEDURE xios(set_domaingroup_attr_hdl), xios(set_domain_attr_hdl), xios(set_fieldgroup_attr_hdl), & 121 xios(set_field_attr_hdl),xios(set_variable_attr_hdl), xios(set_variablegroup_attr_hdl), & 122 xios(set_file_attr_hdl), xios(set_filegroup_attr_hdl), & 123 xios(set_grid_attr_hdl), xios(set_gridgroup_attr_hdl), xios(set_axis_attr_hdl) , & 124 xios(set_axisgroup_attr_hdl), xios(set_context_attr_hdl) 125 END INTERFACE xios(set_attr) 126 127 INTERFACE xios(get_attr) 128 MODULE PROCEDURE xios(get_domaingroup_attr_hdl), xios(get_domain_attr_hdl), xios(get_fieldgroup_attr_hdl), & 129 xios(get_field_attr_hdl), xios(get_variable_attr_hdl), xios(get_variablegroup_attr_hdl), & 130 xios(get_file_attr_hdl), xios(get_filegroup_attr_hdl), & 131 xios(get_grid_attr_hdl), xios(get_gridgroup_attr_hdl), xios(get_axis_attr_hdl) , & 132 xios(get_axisgroup_attr_hdl), xios(get_context_attr_hdl) 133 END INTERFACE xios(get_attr) 134 135 INTERFACE xios(is_defined_attr) 136 MODULE PROCEDURE xios(is_defined_domaingroup_attr_hdl), xios(is_defined_domain_attr_hdl), xios(is_defined_fieldgroup_attr_hdl), & 137 xios(is_defined_field_attr_hdl), xios(is_defined_variable_attr_hdl), xios(is_defined_variablegroup_attr_hdl), & 138 xios(is_defined_file_attr_hdl), xios(is_defined_filegroup_attr_hdl), & 139 xios(is_defined_grid_attr_hdl), xios(is_defined_gridgroup_attr_hdl), xios(is_defined_axis_attr_hdl) , & 140 xios(is_defined_axisgroup_attr_hdl), xios(is_defined_context_attr_hdl) 141 END INTERFACE xios(is_defined_attr) 142 143 INTERFACE xios(get_handle) 144 MODULE PROCEDURE xios(get_context_handle), xios(get_domain_handle), xios(get_domaingroup_handle), & 145 xios(get_file_handle), xios(get_filegroup_handle), xios(get_grid_handle), & 146 xios(get_gridgroup_handle), xios(get_axis_handle), xios(get_axisgroup_handle), & 147 xios(get_field_handle), xios(get_fieldgroup_handle),xios(get_variable_handle), & 148 xios(get_variablegroup_handle) 149 END INTERFACE xios(get_handle) 150 151 INTERFACE xios(add_child) 152 MODULE PROCEDURE xios(add_axis), xios(add_file), xios(add_grid), xios(add_field), xios(add_domain), & 153 xios(add_fieldtofile), xios(add_variabletofile), xios(add_variabletofield), xios(add_axisgroup), & 154 xios(add_filegroup), xios(add_gridgroup), xios(add_fieldgroup), xios(add_domaingroup), & 155 xios(add_fieldgrouptofile), xios(add_variablegrouptofile),xios(add_variablegrouptofield) 156 END INTERFACE xios(add_child) 157 158 159 INTERFACE xios(send_field) 160 MODULE PROCEDURE xios(send_field_r8_1d), xios(send_field_r8_2d), xios(send_field_r8_3d), & 161 xios(send_field_r4_1d), xios(send_field_r4_2d), xios(send_field_r4_3d) 162 END INTERFACE xios(send_field) 163 164 INTERFACE xios(field_is_active) 165 MODULE PROCEDURE xios(field_is_active_id),xios(field_is_active_hdl) 166 END INTERFACE 167 168 INTERFACE xios(getVar) 169 MODULE PROCEDURE xios(getVar_k8), xios(getVar_k4), xios(getVar_int), xios(getVar_logic), xios(getVar_char) 170 END INTERFACE xios(getVar) 171 172 INTERFACE xios(setVar) 173 MODULE PROCEDURE xios(setVar_k8), xios(setVar_k4), xios(setVar_int), xios(setVar_logic), xios(setVar_char) 174 END INTERFACE xios(setVar) 175 176 PUBLIC :: txios(domain), txios(domaingroup),txios(field), txios(fieldgroup),txios(file), txios(filegroup), & 177 txios(grid), txios(gridgroup), txios(axis), txios(axisgroup),txios(context), txios(date), & 178 txios(duration), txios(variable) 179 180 PUBLIC :: xios(set_attr), xios(set_domain_attr), xios(set_domaingroup_attr), xios(set_fieldgroup_attr), & 181 xios(set_field_attr), xios(set_file_attr), xios(set_filegroup_attr), & 182 xios(set_grid_attr), xios(set_gridgroup_attr), xios(set_axis_attr) , & 183 xios(set_axisgroup_attr), xios(set_context_attr) 184 185 PUBLIC :: xios(get_attr), xios(get_domain_attr), xios(get_domaingroup_attr), xios(get_fieldgroup_attr), & 186 xios(get_field_attr), xios(get_file_attr), xios(get_filegroup_attr), & 187 xios(get_grid_attr), xios(get_gridgroup_attr), xios(get_axis_attr) , & 188 xios(get_axisgroup_attr), xios(get_context_attr) 189 190 PUBLIC :: xios(is_defined_attr), xios(is_defined_domain_attr), xios(is_defined_domaingroup_attr), xios(is_defined_fieldgroup_attr), & 191 xios(is_defined_field_attr), xios(is_defined_file_attr), xios(is_defined_filegroup_attr), & 192 xios(is_defined_grid_attr), xios(is_defined_gridgroup_attr), xios(is_defined_axis_attr) , & 193 xios(is_defined_axisgroup_attr), xios(is_defined_context_attr) 194 195 PUBLIC :: xios(get_handle) 196 PUBLIC :: xios(add_child) 197 198 PUBLIC :: xios(is_valid_context),xios(is_valid_domain), xios(is_valid_domaingroup),xios(is_valid_field), & 199 xios(is_valid_fieldgroup), xios(is_valid_file), xios(is_valid_filegroup), xios(is_valid_grid), & 200 xios(is_valid_gridgroup), xios(is_valid_axis), xios(is_valid_axisgroup), xios(is_valid_variable), & 201 xios(is_valid_variablegroup) 202 203 PUBLIC :: xios(set_current_context) 204 PUBLIC :: xios(initialize), xios(init_server), xios(finalize), xios(context_initialize),xios(context_is_initialized), & 205 xios(solve_inheritance), xios(close_context_definition), xios(context_finalize), xios(send_field), & 206 xios(field_is_active) 207 208 PUBLIC :: xios(define_calendar), xios(set_timestep), xios(set_start_date), xios(set_time_origin), & 209 xios(get_calendar_type), xios(get_timestep), xios(get_start_date), xios(get_time_origin), & 210 xios(update_calendar), xios(get_current_date), & 211 xios(get_year_length_in_seconds), xios(get_day_length_in_seconds) 212 213 PUBLIC :: xios(year), xios(month), xios(day), xios(hour), xios(minute), xios(second), xios(timestep), & 214 xios(duration_add), xios(duration_sub), xios(duration_mult), xios(duration_neg), & 215 xios(duration_eq), xios(duration_neq) 216 217 PUBLIC :: xios(date_convert_to_seconds), & 218 xios(date_add_duration), xios(date_sub_duration), xios(date_sub), & 219 xios(date_eq), xios(date_neq), xios(date_lt), xios(date_le), xios(date_gt), xios(date_ge), & 220 xios(date_get_second_of_year), xios(date_get_day_of_year), xios(date_get_fraction_of_year), & 221 xios(date_get_second_of_day), xios(date_get_fraction_of_day) 222 223 PUBLIC :: OPERATOR(+), OPERATOR(-), OPERATOR(*), & 224 OPERATOR(==), OPERATOR(/=), OPERATOR(<), OPERATOR(<=), OPERATOR(>), OPERATOR(>=), & 225 ASSIGNMENT(=) 226 227 PUBLIC :: xios(getVar) 228 PUBLIC :: xios(setVar) 69 USE XIOS_INTERFACES, ONLY : xios(set_attr), xios(get_attr), xios(is_defined_attr), xios(get_handle), & 70 xios(add_child), xios(send_field), xios(field_is_active), xios(getVar), xios(setVar) 229 71 230 72 END MODULE XIOS
Note: See TracChangeset
for help on using the changeset viewer.