Changeset 555
- Timestamp:
- 02/11/15 16:47:47 (9 years ago)
- Location:
- XIOS/trunk/src/interface
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp
r546 r555 44 44 45 45 46 void cxios_set_axis_data_begin(axis_Ptr axis_hdl, int data_begin) 47 { 48 CTimer::get("XIOS").resume(); 49 axis_hdl->data_begin.setValue(data_begin); 50 CTimer::get("XIOS").suspend(); 51 } 52 53 void cxios_get_axis_data_begin(axis_Ptr axis_hdl, int* data_begin) 54 { 55 *data_begin = axis_hdl->data_begin.getInheritedValue(); 56 } 57 58 bool cxios_is_defined_axis_data_begin(axis_Ptr axis_hdl ) 59 { 60 CTimer::get("XIOS").resume(); 61 return axis_hdl->data_begin.hasInheritedValue(); 62 CTimer::get("XIOS").suspend(); 63 } 64 65 66 67 void cxios_set_axis_data_index(axis_Ptr axis_hdl, int* data_index, int extent1) 68 { 69 CTimer::get("XIOS").resume(); 70 CArray<int,1> tmp(data_index,shape(extent1),neverDeleteData) ; 71 axis_hdl->data_index.reference(tmp.copy()); 72 CTimer::get("XIOS").suspend(); 73 } 74 75 void cxios_get_axis_data_index(axis_Ptr axis_hdl, int* data_index, int extent1) 76 { 77 CTimer::get("XIOS").resume(); 78 CArray<int,1> tmp(data_index,shape(extent1),neverDeleteData) ; 79 tmp=axis_hdl->data_index.getInheritedValue() ; 80 CTimer::get("XIOS").suspend(); 81 } 82 83 bool cxios_is_defined_axis_data_index(axis_Ptr axis_hdl ) 84 { 85 CTimer::get("XIOS").resume(); 86 return axis_hdl->data_index.hasInheritedValue(); 87 CTimer::get("XIOS").suspend(); 88 } 89 90 91 92 void cxios_set_axis_data_n(axis_Ptr axis_hdl, int data_n) 93 { 94 CTimer::get("XIOS").resume(); 95 axis_hdl->data_n.setValue(data_n); 96 CTimer::get("XIOS").suspend(); 97 } 98 99 void cxios_get_axis_data_n(axis_Ptr axis_hdl, int* data_n) 100 { 101 *data_n = axis_hdl->data_n.getInheritedValue(); 102 } 103 104 bool cxios_is_defined_axis_data_n(axis_Ptr axis_hdl ) 105 { 106 CTimer::get("XIOS").resume(); 107 return axis_hdl->data_n.hasInheritedValue(); 108 CTimer::get("XIOS").suspend(); 109 } 110 111 112 113 void cxios_set_axis_ibegin(axis_Ptr axis_hdl, int ibegin) 114 { 115 CTimer::get("XIOS").resume(); 116 axis_hdl->ibegin.setValue(ibegin); 117 CTimer::get("XIOS").suspend(); 118 } 119 120 void cxios_get_axis_ibegin(axis_Ptr axis_hdl, int* ibegin) 121 { 122 *ibegin = axis_hdl->ibegin.getInheritedValue(); 123 } 124 125 bool cxios_is_defined_axis_ibegin(axis_Ptr axis_hdl ) 126 { 127 CTimer::get("XIOS").resume(); 128 return axis_hdl->ibegin.hasInheritedValue(); 129 CTimer::get("XIOS").suspend(); 130 } 131 132 133 46 134 void cxios_set_axis_long_name(axis_Ptr axis_hdl, const char * long_name, int long_name_size) 47 135 { … … 70 158 71 159 160 void cxios_set_axis_mask(axis_Ptr axis_hdl, bool* mask, int extent1) 161 { 162 CTimer::get("XIOS").resume(); 163 CArray<bool,1> tmp(mask,shape(extent1),neverDeleteData) ; 164 axis_hdl->mask.reference(tmp.copy()); 165 CTimer::get("XIOS").suspend(); 166 } 167 168 void cxios_get_axis_mask(axis_Ptr axis_hdl, bool* mask, int extent1) 169 { 170 CTimer::get("XIOS").resume(); 171 CArray<bool,1> tmp(mask,shape(extent1),neverDeleteData) ; 172 tmp=axis_hdl->mask.getInheritedValue() ; 173 CTimer::get("XIOS").suspend(); 174 } 175 176 bool cxios_is_defined_axis_mask(axis_Ptr axis_hdl ) 177 { 178 CTimer::get("XIOS").resume(); 179 return axis_hdl->mask.hasInheritedValue(); 180 CTimer::get("XIOS").suspend(); 181 } 182 183 184 72 185 void cxios_set_axis_name(axis_Ptr axis_hdl, const char * name, int name_size) 73 186 { … … 96 209 97 210 211 void cxios_set_axis_ni(axis_Ptr axis_hdl, int ni) 212 { 213 CTimer::get("XIOS").resume(); 214 axis_hdl->ni.setValue(ni); 215 CTimer::get("XIOS").suspend(); 216 } 217 218 void cxios_get_axis_ni(axis_Ptr axis_hdl, int* ni) 219 { 220 *ni = axis_hdl->ni.getInheritedValue(); 221 } 222 223 bool cxios_is_defined_axis_ni(axis_Ptr axis_hdl ) 224 { 225 CTimer::get("XIOS").resume(); 226 return axis_hdl->ni.hasInheritedValue(); 227 CTimer::get("XIOS").suspend(); 228 } 229 230 231 98 232 void cxios_set_axis_positive(axis_Ptr axis_hdl, const char * positive, int positive_size) 99 233 { -
XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp
r546 r555 44 44 45 45 46 void cxios_set_axisgroup_data_begin(axisgroup_Ptr axisgroup_hdl, int data_begin) 47 { 48 CTimer::get("XIOS").resume(); 49 axisgroup_hdl->data_begin.setValue(data_begin); 50 CTimer::get("XIOS").suspend(); 51 } 52 53 void cxios_get_axisgroup_data_begin(axisgroup_Ptr axisgroup_hdl, int* data_begin) 54 { 55 *data_begin = axisgroup_hdl->data_begin.getInheritedValue(); 56 } 57 58 bool cxios_is_defined_axisgroup_data_begin(axisgroup_Ptr axisgroup_hdl ) 59 { 60 CTimer::get("XIOS").resume(); 61 return axisgroup_hdl->data_begin.hasInheritedValue(); 62 CTimer::get("XIOS").suspend(); 63 } 64 65 66 67 void cxios_set_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl, int* data_index, int extent1) 68 { 69 CTimer::get("XIOS").resume(); 70 CArray<int,1> tmp(data_index,shape(extent1),neverDeleteData) ; 71 axisgroup_hdl->data_index.reference(tmp.copy()); 72 CTimer::get("XIOS").suspend(); 73 } 74 75 void cxios_get_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl, int* data_index, int extent1) 76 { 77 CTimer::get("XIOS").resume(); 78 CArray<int,1> tmp(data_index,shape(extent1),neverDeleteData) ; 79 tmp=axisgroup_hdl->data_index.getInheritedValue() ; 80 CTimer::get("XIOS").suspend(); 81 } 82 83 bool cxios_is_defined_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl ) 84 { 85 CTimer::get("XIOS").resume(); 86 return axisgroup_hdl->data_index.hasInheritedValue(); 87 CTimer::get("XIOS").suspend(); 88 } 89 90 91 92 void cxios_set_axisgroup_data_n(axisgroup_Ptr axisgroup_hdl, int data_n) 93 { 94 CTimer::get("XIOS").resume(); 95 axisgroup_hdl->data_n.setValue(data_n); 96 CTimer::get("XIOS").suspend(); 97 } 98 99 void cxios_get_axisgroup_data_n(axisgroup_Ptr axisgroup_hdl, int* data_n) 100 { 101 *data_n = axisgroup_hdl->data_n.getInheritedValue(); 102 } 103 104 bool cxios_is_defined_axisgroup_data_n(axisgroup_Ptr axisgroup_hdl ) 105 { 106 CTimer::get("XIOS").resume(); 107 return axisgroup_hdl->data_n.hasInheritedValue(); 108 CTimer::get("XIOS").suspend(); 109 } 110 111 112 46 113 void cxios_set_axisgroup_group_ref(axisgroup_Ptr axisgroup_hdl, const char * group_ref, int group_ref_size) 47 114 { … … 70 137 71 138 139 void cxios_set_axisgroup_ibegin(axisgroup_Ptr axisgroup_hdl, int ibegin) 140 { 141 CTimer::get("XIOS").resume(); 142 axisgroup_hdl->ibegin.setValue(ibegin); 143 CTimer::get("XIOS").suspend(); 144 } 145 146 void cxios_get_axisgroup_ibegin(axisgroup_Ptr axisgroup_hdl, int* ibegin) 147 { 148 *ibegin = axisgroup_hdl->ibegin.getInheritedValue(); 149 } 150 151 bool cxios_is_defined_axisgroup_ibegin(axisgroup_Ptr axisgroup_hdl ) 152 { 153 CTimer::get("XIOS").resume(); 154 return axisgroup_hdl->ibegin.hasInheritedValue(); 155 CTimer::get("XIOS").suspend(); 156 } 157 158 159 72 160 void cxios_set_axisgroup_long_name(axisgroup_Ptr axisgroup_hdl, const char * long_name, int long_name_size) 73 161 { … … 96 184 97 185 186 void cxios_set_axisgroup_mask(axisgroup_Ptr axisgroup_hdl, bool* mask, int extent1) 187 { 188 CTimer::get("XIOS").resume(); 189 CArray<bool,1> tmp(mask,shape(extent1),neverDeleteData) ; 190 axisgroup_hdl->mask.reference(tmp.copy()); 191 CTimer::get("XIOS").suspend(); 192 } 193 194 void cxios_get_axisgroup_mask(axisgroup_Ptr axisgroup_hdl, bool* mask, int extent1) 195 { 196 CTimer::get("XIOS").resume(); 197 CArray<bool,1> tmp(mask,shape(extent1),neverDeleteData) ; 198 tmp=axisgroup_hdl->mask.getInheritedValue() ; 199 CTimer::get("XIOS").suspend(); 200 } 201 202 bool cxios_is_defined_axisgroup_mask(axisgroup_Ptr axisgroup_hdl ) 203 { 204 CTimer::get("XIOS").resume(); 205 return axisgroup_hdl->mask.hasInheritedValue(); 206 CTimer::get("XIOS").suspend(); 207 } 208 209 210 98 211 void cxios_set_axisgroup_name(axisgroup_Ptr axisgroup_hdl, const char * name, int name_size) 99 212 { … … 122 235 123 236 237 void cxios_set_axisgroup_ni(axisgroup_Ptr axisgroup_hdl, int ni) 238 { 239 CTimer::get("XIOS").resume(); 240 axisgroup_hdl->ni.setValue(ni); 241 CTimer::get("XIOS").suspend(); 242 } 243 244 void cxios_get_axisgroup_ni(axisgroup_Ptr axisgroup_hdl, int* ni) 245 { 246 *ni = axisgroup_hdl->ni.getInheritedValue(); 247 } 248 249 bool cxios_is_defined_axisgroup_ni(axisgroup_Ptr axisgroup_hdl ) 250 { 251 CTimer::get("XIOS").resume(); 252 return axisgroup_hdl->ni.hasInheritedValue(); 253 CTimer::get("XIOS").suspend(); 254 } 255 256 257 124 258 void cxios_set_axisgroup_positive(axisgroup_Ptr axisgroup_hdl, const char * positive, int positive_size) 125 259 { -
XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp
r551 r555 17 17 { 18 18 typedef xios::CGrid* grid_Ptr; 19 20 void cxios_set_grid_axisDom Order(grid_Ptr grid_hdl, bool* axisDomainOrder, int extent1)19 20 void cxios_set_grid_axisDomainOrder(grid_Ptr grid_hdl, bool* axisDomainOrder, int extent1) 21 21 { 22 22 CTimer::get("XIOS").resume(); … … 25 25 CTimer::get("XIOS").suspend(); 26 26 } 27 28 void cxios_get_grid_axisDom Order(grid_Ptr grid_hdl, bool* axisDomainOrder, int extent1)27 28 void cxios_get_grid_axisDomainOrder(grid_Ptr grid_hdl, bool* axisDomainOrder, int extent1) 29 29 { 30 30 CTimer::get("XIOS").resume(); … … 33 33 CTimer::get("XIOS").suspend(); 34 34 } 35 36 bool cxios_is_defined_grid_axisDom Order(grid_Ptr grid_hdl )35 36 bool cxios_is_defined_grid_axisDomainOrder(grid_Ptr grid_hdl ) 37 37 { 38 38 CTimer::get("XIOS").resume(); … … 40 40 CTimer::get("XIOS").suspend(); 41 41 } 42 43 44 42 43 44 45 45 void cxios_set_grid_description(grid_Ptr grid_hdl, const char * description, int description_size) 46 46 { … … 51 51 CTimer::get("XIOS").suspend(); 52 52 } 53 53 54 54 void cxios_get_grid_description(grid_Ptr grid_hdl, char * description, int description_size) 55 55 { … … 59 59 CTimer::get("XIOS").suspend(); 60 60 } 61 61 62 62 bool cxios_is_defined_grid_description(grid_Ptr grid_hdl ) 63 63 { … … 66 66 CTimer::get("XIOS").suspend(); 67 67 } 68 69 70 68 69 70 71 71 void cxios_set_grid_mask(grid_Ptr grid_hdl, bool* mask, int extent1, int extent2, int extent3) 72 72 { … … 76 76 CTimer::get("XIOS").suspend(); 77 77 } 78 78 79 79 void cxios_get_grid_mask(grid_Ptr grid_hdl, bool* mask, int extent1, int extent2, int extent3) 80 80 { … … 84 84 CTimer::get("XIOS").suspend(); 85 85 } 86 86 87 87 bool cxios_is_defined_grid_mask(grid_Ptr grid_hdl ) 88 88 { … … 91 91 CTimer::get("XIOS").suspend(); 92 92 } 93 94 95 93 94 95 96 96 void cxios_set_grid_name(grid_Ptr grid_hdl, const char * name, int name_size) 97 97 { … … 102 102 CTimer::get("XIOS").suspend(); 103 103 } 104 104 105 105 void cxios_get_grid_name(grid_Ptr grid_hdl, char * name, int name_size) 106 106 { … … 110 110 CTimer::get("XIOS").suspend(); 111 111 } 112 112 113 113 bool cxios_is_defined_grid_name(grid_Ptr grid_hdl ) 114 114 { … … 117 117 CTimer::get("XIOS").suspend(); 118 118 } 119 120 121 122 119 120 121 122 123 123 } -
XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp
r551 r555 17 17 { 18 18 typedef xios::CGridGroup* gridgroup_Ptr; 19 20 void cxios_set_gridgroup_axisDom Order(gridgroup_Ptr gridgroup_hdl, bool* axisDomainOrder, int extent1)19 20 void cxios_set_gridgroup_axisDomainOrder(gridgroup_Ptr gridgroup_hdl, bool* axisDomainOrder, int extent1) 21 21 { 22 22 CTimer::get("XIOS").resume(); … … 25 25 CTimer::get("XIOS").suspend(); 26 26 } 27 28 void cxios_get_gridgroup_axisDom Order(gridgroup_Ptr gridgroup_hdl, bool* axisDomainOrder, int extent1)27 28 void cxios_get_gridgroup_axisDomainOrder(gridgroup_Ptr gridgroup_hdl, bool* axisDomainOrder, int extent1) 29 29 { 30 30 CTimer::get("XIOS").resume(); … … 33 33 CTimer::get("XIOS").suspend(); 34 34 } 35 36 bool cxios_is_defined_gridgroup_axisDom Order(gridgroup_Ptr gridgroup_hdl )35 36 bool cxios_is_defined_gridgroup_axisDomainOrder(gridgroup_Ptr gridgroup_hdl ) 37 37 { 38 38 CTimer::get("XIOS").resume(); … … 40 40 CTimer::get("XIOS").suspend(); 41 41 } 42 43 44 42 43 44 45 45 void cxios_set_gridgroup_description(gridgroup_Ptr gridgroup_hdl, const char * description, int description_size) 46 46 { … … 51 51 CTimer::get("XIOS").suspend(); 52 52 } 53 53 54 54 void cxios_get_gridgroup_description(gridgroup_Ptr gridgroup_hdl, char * description, int description_size) 55 55 { … … 59 59 CTimer::get("XIOS").suspend(); 60 60 } 61 61 62 62 bool cxios_is_defined_gridgroup_description(gridgroup_Ptr gridgroup_hdl ) 63 63 { … … 66 66 CTimer::get("XIOS").suspend(); 67 67 } 68 69 70 68 69 70 71 71 void cxios_set_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl, const char * group_ref, int group_ref_size) 72 72 { … … 77 77 CTimer::get("XIOS").suspend(); 78 78 } 79 79 80 80 void cxios_get_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl, char * group_ref, int group_ref_size) 81 81 { … … 85 85 CTimer::get("XIOS").suspend(); 86 86 } 87 87 88 88 bool cxios_is_defined_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl ) 89 89 { … … 92 92 CTimer::get("XIOS").suspend(); 93 93 } 94 95 96 94 95 96 97 97 void cxios_set_gridgroup_mask(gridgroup_Ptr gridgroup_hdl, bool* mask, int extent1, int extent2, int extent3) 98 98 { … … 102 102 CTimer::get("XIOS").suspend(); 103 103 } 104 104 105 105 void cxios_get_gridgroup_mask(gridgroup_Ptr gridgroup_hdl, bool* mask, int extent1, int extent2, int extent3) 106 106 { … … 110 110 CTimer::get("XIOS").suspend(); 111 111 } 112 112 113 113 bool cxios_is_defined_gridgroup_mask(gridgroup_Ptr gridgroup_hdl ) 114 114 { … … 117 117 CTimer::get("XIOS").suspend(); 118 118 } 119 120 121 119 120 121 122 122 void cxios_set_gridgroup_name(gridgroup_Ptr gridgroup_hdl, const char * name, int name_size) 123 123 { … … 128 128 CTimer::get("XIOS").suspend(); 129 129 } 130 130 131 131 void cxios_get_gridgroup_name(gridgroup_Ptr gridgroup_hdl, char * name, int name_size) 132 132 { … … 136 136 CTimer::get("XIOS").suspend(); 137 137 } 138 138 139 139 bool cxios_is_defined_gridgroup_name(gridgroup_Ptr gridgroup_hdl ) 140 140 { … … 143 143 CTimer::get("XIOS").suspend(); 144 144 } 145 146 147 148 145 146 147 148 149 149 } -
XIOS/trunk/src/interface/fortran_attr/axis_interface_attr.F90
r546 r555 31 31 32 32 33 SUBROUTINE cxios_set_axis_data_begin(axis_hdl, data_begin) BIND(C) 34 USE ISO_C_BINDING 35 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 36 INTEGER (KIND=C_INT) , VALUE :: data_begin 37 END SUBROUTINE cxios_set_axis_data_begin 38 39 SUBROUTINE cxios_get_axis_data_begin(axis_hdl, data_begin) BIND(C) 40 USE ISO_C_BINDING 41 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 42 INTEGER (KIND=C_INT) :: data_begin 43 END SUBROUTINE cxios_get_axis_data_begin 44 45 FUNCTION cxios_is_defined_axis_data_begin(axis_hdl ) BIND(C) 46 USE ISO_C_BINDING 47 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_data_begin 48 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 49 END FUNCTION cxios_is_defined_axis_data_begin 50 51 52 SUBROUTINE cxios_set_axis_data_index(axis_hdl, data_index, extent1) BIND(C) 53 USE ISO_C_BINDING 54 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 55 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_index 56 INTEGER (kind = C_INT), VALUE :: extent1 57 END SUBROUTINE cxios_set_axis_data_index 58 59 SUBROUTINE cxios_get_axis_data_index(axis_hdl, data_index, extent1) BIND(C) 60 USE ISO_C_BINDING 61 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 62 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_index 63 INTEGER (kind = C_INT), VALUE :: extent1 64 END SUBROUTINE cxios_get_axis_data_index 65 66 FUNCTION cxios_is_defined_axis_data_index(axis_hdl ) BIND(C) 67 USE ISO_C_BINDING 68 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_data_index 69 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 70 END FUNCTION cxios_is_defined_axis_data_index 71 72 73 SUBROUTINE cxios_set_axis_data_n(axis_hdl, data_n) BIND(C) 74 USE ISO_C_BINDING 75 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 76 INTEGER (KIND=C_INT) , VALUE :: data_n 77 END SUBROUTINE cxios_set_axis_data_n 78 79 SUBROUTINE cxios_get_axis_data_n(axis_hdl, data_n) BIND(C) 80 USE ISO_C_BINDING 81 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 82 INTEGER (KIND=C_INT) :: data_n 83 END SUBROUTINE cxios_get_axis_data_n 84 85 FUNCTION cxios_is_defined_axis_data_n(axis_hdl ) BIND(C) 86 USE ISO_C_BINDING 87 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_data_n 88 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 89 END FUNCTION cxios_is_defined_axis_data_n 90 91 92 SUBROUTINE cxios_set_axis_ibegin(axis_hdl, ibegin) BIND(C) 93 USE ISO_C_BINDING 94 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 95 INTEGER (KIND=C_INT) , VALUE :: ibegin 96 END SUBROUTINE cxios_set_axis_ibegin 97 98 SUBROUTINE cxios_get_axis_ibegin(axis_hdl, ibegin) BIND(C) 99 USE ISO_C_BINDING 100 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 101 INTEGER (KIND=C_INT) :: ibegin 102 END SUBROUTINE cxios_get_axis_ibegin 103 104 FUNCTION cxios_is_defined_axis_ibegin(axis_hdl ) BIND(C) 105 USE ISO_C_BINDING 106 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_ibegin 107 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 108 END FUNCTION cxios_is_defined_axis_ibegin 109 110 33 111 SUBROUTINE cxios_set_axis_long_name(axis_hdl, long_name, long_name_size) BIND(C) 34 112 USE ISO_C_BINDING … … 52 130 53 131 132 SUBROUTINE cxios_set_axis_mask(axis_hdl, mask, extent1) BIND(C) 133 USE ISO_C_BINDING 134 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 135 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask 136 INTEGER (kind = C_INT), VALUE :: extent1 137 END SUBROUTINE cxios_set_axis_mask 138 139 SUBROUTINE cxios_get_axis_mask(axis_hdl, mask, extent1) BIND(C) 140 USE ISO_C_BINDING 141 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 142 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask 143 INTEGER (kind = C_INT), VALUE :: extent1 144 END SUBROUTINE cxios_get_axis_mask 145 146 FUNCTION cxios_is_defined_axis_mask(axis_hdl ) BIND(C) 147 USE ISO_C_BINDING 148 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_mask 149 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 150 END FUNCTION cxios_is_defined_axis_mask 151 152 54 153 SUBROUTINE cxios_set_axis_name(axis_hdl, name, name_size) BIND(C) 55 154 USE ISO_C_BINDING … … 73 172 74 173 174 SUBROUTINE cxios_set_axis_ni(axis_hdl, ni) BIND(C) 175 USE ISO_C_BINDING 176 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 177 INTEGER (KIND=C_INT) , VALUE :: ni 178 END SUBROUTINE cxios_set_axis_ni 179 180 SUBROUTINE cxios_get_axis_ni(axis_hdl, ni) BIND(C) 181 USE ISO_C_BINDING 182 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 183 INTEGER (KIND=C_INT) :: ni 184 END SUBROUTINE cxios_get_axis_ni 185 186 FUNCTION cxios_is_defined_axis_ni(axis_hdl ) BIND(C) 187 USE ISO_C_BINDING 188 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_ni 189 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 190 END FUNCTION cxios_is_defined_axis_ni 191 192 75 193 SUBROUTINE cxios_set_axis_positive(axis_hdl, positive, positive_size) BIND(C) 76 194 USE ISO_C_BINDING -
XIOS/trunk/src/interface/fortran_attr/axisgroup_interface_attr.F90
r546 r555 31 31 32 32 33 SUBROUTINE cxios_set_axisgroup_data_begin(axisgroup_hdl, data_begin) BIND(C) 34 USE ISO_C_BINDING 35 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 36 INTEGER (KIND=C_INT) , VALUE :: data_begin 37 END SUBROUTINE cxios_set_axisgroup_data_begin 38 39 SUBROUTINE cxios_get_axisgroup_data_begin(axisgroup_hdl, data_begin) BIND(C) 40 USE ISO_C_BINDING 41 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 42 INTEGER (KIND=C_INT) :: data_begin 43 END SUBROUTINE cxios_get_axisgroup_data_begin 44 45 FUNCTION cxios_is_defined_axisgroup_data_begin(axisgroup_hdl ) BIND(C) 46 USE ISO_C_BINDING 47 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_data_begin 48 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 49 END FUNCTION cxios_is_defined_axisgroup_data_begin 50 51 52 SUBROUTINE cxios_set_axisgroup_data_index(axisgroup_hdl, data_index, extent1) BIND(C) 53 USE ISO_C_BINDING 54 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 55 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_index 56 INTEGER (kind = C_INT), VALUE :: extent1 57 END SUBROUTINE cxios_set_axisgroup_data_index 58 59 SUBROUTINE cxios_get_axisgroup_data_index(axisgroup_hdl, data_index, extent1) BIND(C) 60 USE ISO_C_BINDING 61 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 62 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_index 63 INTEGER (kind = C_INT), VALUE :: extent1 64 END SUBROUTINE cxios_get_axisgroup_data_index 65 66 FUNCTION cxios_is_defined_axisgroup_data_index(axisgroup_hdl ) BIND(C) 67 USE ISO_C_BINDING 68 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_data_index 69 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 70 END FUNCTION cxios_is_defined_axisgroup_data_index 71 72 73 SUBROUTINE cxios_set_axisgroup_data_n(axisgroup_hdl, data_n) BIND(C) 74 USE ISO_C_BINDING 75 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 76 INTEGER (KIND=C_INT) , VALUE :: data_n 77 END SUBROUTINE cxios_set_axisgroup_data_n 78 79 SUBROUTINE cxios_get_axisgroup_data_n(axisgroup_hdl, data_n) BIND(C) 80 USE ISO_C_BINDING 81 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 82 INTEGER (KIND=C_INT) :: data_n 83 END SUBROUTINE cxios_get_axisgroup_data_n 84 85 FUNCTION cxios_is_defined_axisgroup_data_n(axisgroup_hdl ) BIND(C) 86 USE ISO_C_BINDING 87 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_data_n 88 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 89 END FUNCTION cxios_is_defined_axisgroup_data_n 90 91 33 92 SUBROUTINE cxios_set_axisgroup_group_ref(axisgroup_hdl, group_ref, group_ref_size) BIND(C) 34 93 USE ISO_C_BINDING … … 52 111 53 112 113 SUBROUTINE cxios_set_axisgroup_ibegin(axisgroup_hdl, ibegin) BIND(C) 114 USE ISO_C_BINDING 115 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 116 INTEGER (KIND=C_INT) , VALUE :: ibegin 117 END SUBROUTINE cxios_set_axisgroup_ibegin 118 119 SUBROUTINE cxios_get_axisgroup_ibegin(axisgroup_hdl, ibegin) BIND(C) 120 USE ISO_C_BINDING 121 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 122 INTEGER (KIND=C_INT) :: ibegin 123 END SUBROUTINE cxios_get_axisgroup_ibegin 124 125 FUNCTION cxios_is_defined_axisgroup_ibegin(axisgroup_hdl ) BIND(C) 126 USE ISO_C_BINDING 127 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_ibegin 128 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 129 END FUNCTION cxios_is_defined_axisgroup_ibegin 130 131 54 132 SUBROUTINE cxios_set_axisgroup_long_name(axisgroup_hdl, long_name, long_name_size) BIND(C) 55 133 USE ISO_C_BINDING … … 73 151 74 152 153 SUBROUTINE cxios_set_axisgroup_mask(axisgroup_hdl, mask, extent1) BIND(C) 154 USE ISO_C_BINDING 155 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 156 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask 157 INTEGER (kind = C_INT), VALUE :: extent1 158 END SUBROUTINE cxios_set_axisgroup_mask 159 160 SUBROUTINE cxios_get_axisgroup_mask(axisgroup_hdl, mask, extent1) BIND(C) 161 USE ISO_C_BINDING 162 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 163 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask 164 INTEGER (kind = C_INT), VALUE :: extent1 165 END SUBROUTINE cxios_get_axisgroup_mask 166 167 FUNCTION cxios_is_defined_axisgroup_mask(axisgroup_hdl ) BIND(C) 168 USE ISO_C_BINDING 169 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_mask 170 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 171 END FUNCTION cxios_is_defined_axisgroup_mask 172 173 75 174 SUBROUTINE cxios_set_axisgroup_name(axisgroup_hdl, name, name_size) BIND(C) 76 175 USE ISO_C_BINDING … … 94 193 95 194 195 SUBROUTINE cxios_set_axisgroup_ni(axisgroup_hdl, ni) BIND(C) 196 USE ISO_C_BINDING 197 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 198 INTEGER (KIND=C_INT) , VALUE :: ni 199 END SUBROUTINE cxios_set_axisgroup_ni 200 201 SUBROUTINE cxios_get_axisgroup_ni(axisgroup_hdl, ni) BIND(C) 202 USE ISO_C_BINDING 203 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 204 INTEGER (KIND=C_INT) :: ni 205 END SUBROUTINE cxios_get_axisgroup_ni 206 207 FUNCTION cxios_is_defined_axisgroup_ni(axisgroup_hdl ) BIND(C) 208 USE ISO_C_BINDING 209 LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_ni 210 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 211 END FUNCTION cxios_is_defined_axisgroup_ni 212 213 96 214 SUBROUTINE cxios_set_axisgroup_positive(axisgroup_hdl, positive, positive_size) BIND(C) 97 215 USE ISO_C_BINDING -
XIOS/trunk/src/interface/fortran_attr/grid_interface_attr.F90
r546 r555 10 10 11 11 12 SUBROUTINE cxios_set_grid_axisDom Order(grid_hdl, axisDomOrder, extent1) BIND(C)12 SUBROUTINE cxios_set_grid_axisDomainOrder(grid_hdl, axisDomainOrder, extent1) BIND(C) 13 13 USE ISO_C_BINDING 14 14 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 15 INTEGER (KIND=C_INT) , DIMENSION(*) :: axisDomOrder15 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: axisDomainOrder 16 16 INTEGER (kind = C_INT), VALUE :: extent1 17 END SUBROUTINE cxios_set_grid_axisDom Order17 END SUBROUTINE cxios_set_grid_axisDomainOrder 18 18 19 SUBROUTINE cxios_get_grid_axisDom Order(grid_hdl, axisDomOrder, extent1) BIND(C)19 SUBROUTINE cxios_get_grid_axisDomainOrder(grid_hdl, axisDomainOrder, extent1) BIND(C) 20 20 USE ISO_C_BINDING 21 21 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 22 INTEGER (KIND=C_INT) , DIMENSION(*) :: axisDomOrder22 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: axisDomainOrder 23 23 INTEGER (kind = C_INT), VALUE :: extent1 24 END SUBROUTINE cxios_get_grid_axisDom Order24 END SUBROUTINE cxios_get_grid_axisDomainOrder 25 25 26 FUNCTION cxios_is_defined_grid_axisDom Order(grid_hdl ) BIND(C)26 FUNCTION cxios_is_defined_grid_axisDomainOrder(grid_hdl ) BIND(C) 27 27 USE ISO_C_BINDING 28 LOGICAL(kind=C_BOOL) :: cxios_is_defined_grid_axisDom Order28 LOGICAL(kind=C_BOOL) :: cxios_is_defined_grid_axisDomainOrder 29 29 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 30 END FUNCTION cxios_is_defined_grid_axisDom Order30 END FUNCTION cxios_is_defined_grid_axisDomainOrder 31 31 32 32 -
XIOS/trunk/src/interface/fortran_attr/gridgroup_interface_attr.F90
r546 r555 10 10 11 11 12 SUBROUTINE cxios_set_gridgroup_axisDom Order(gridgroup_hdl, axisDomOrder, extent1) BIND(C)12 SUBROUTINE cxios_set_gridgroup_axisDomainOrder(gridgroup_hdl, axisDomainOrder, extent1) BIND(C) 13 13 USE ISO_C_BINDING 14 14 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 15 INTEGER (KIND=C_INT) , DIMENSION(*) :: axisDomOrder15 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: axisDomainOrder 16 16 INTEGER (kind = C_INT), VALUE :: extent1 17 END SUBROUTINE cxios_set_gridgroup_axisDom Order17 END SUBROUTINE cxios_set_gridgroup_axisDomainOrder 18 18 19 SUBROUTINE cxios_get_gridgroup_axisDom Order(gridgroup_hdl, axisDomOrder, extent1) BIND(C)19 SUBROUTINE cxios_get_gridgroup_axisDomainOrder(gridgroup_hdl, axisDomainOrder, extent1) BIND(C) 20 20 USE ISO_C_BINDING 21 21 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 22 INTEGER (KIND=C_INT) , DIMENSION(*) :: axisDomOrder22 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: axisDomainOrder 23 23 INTEGER (kind = C_INT), VALUE :: extent1 24 END SUBROUTINE cxios_get_gridgroup_axisDom Order24 END SUBROUTINE cxios_get_gridgroup_axisDomainOrder 25 25 26 FUNCTION cxios_is_defined_gridgroup_axisDom Order(gridgroup_hdl ) BIND(C)26 FUNCTION cxios_is_defined_gridgroup_axisDomainOrder(gridgroup_hdl ) BIND(C) 27 27 USE ISO_C_BINDING 28 LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_axisDom Order28 LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_axisDomainOrder 29 29 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 30 END FUNCTION cxios_is_defined_gridgroup_axisDom Order30 END FUNCTION cxios_is_defined_gridgroup_axisDomainOrder 31 31 32 32 -
XIOS/trunk/src/interface/fortran_attr/iaxis_attr.F90
r546 r555 12 12 13 13 SUBROUTINE xios(set_axis_attr) & 14 ( axis_id, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&15 , zoom_end, zoom_size )14 ( axis_id, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 15 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 16 16 17 17 IMPLICIT NONE … … 19 19 CHARACTER(LEN=*), INTENT(IN) ::axis_id 20 20 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 21 INTEGER , OPTIONAL, INTENT(IN) :: data_begin 22 INTEGER , OPTIONAL, INTENT(IN) :: data_index(:) 23 INTEGER , OPTIONAL, INTENT(IN) :: data_n 24 INTEGER , OPTIONAL, INTENT(IN) :: ibegin 21 25 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 26 LOGICAL , OPTIONAL, INTENT(IN) :: mask(:) 27 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 22 28 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 29 INTEGER , OPTIONAL, INTENT(IN) :: ni 23 30 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive 24 31 INTEGER , OPTIONAL, INTENT(IN) :: size … … 32 39 CALL xios(get_axis_handle)(axis_id,axis_hdl) 33 40 CALL xios(set_axis_attr_hdl_) & 34 ( axis_hdl, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&35 , zoom_end, zoom_size )41 ( axis_hdl, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 42 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 36 43 37 44 END SUBROUTINE xios(set_axis_attr) 38 45 39 46 SUBROUTINE xios(set_axis_attr_hdl) & 40 ( axis_hdl, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&41 , zoom_end, zoom_size )47 ( axis_hdl, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 48 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 42 49 43 50 IMPLICIT NONE 44 51 TYPE(txios(axis)) , INTENT(IN) :: axis_hdl 45 52 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 53 INTEGER , OPTIONAL, INTENT(IN) :: data_begin 54 INTEGER , OPTIONAL, INTENT(IN) :: data_index(:) 55 INTEGER , OPTIONAL, INTENT(IN) :: data_n 56 INTEGER , OPTIONAL, INTENT(IN) :: ibegin 46 57 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 58 LOGICAL , OPTIONAL, INTENT(IN) :: mask(:) 59 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 47 60 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 61 INTEGER , OPTIONAL, INTENT(IN) :: ni 48 62 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive 49 63 INTEGER , OPTIONAL, INTENT(IN) :: size … … 56 70 57 71 CALL xios(set_axis_attr_hdl_) & 58 ( axis_hdl, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&59 , zoom_end, zoom_size )72 ( axis_hdl, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 73 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 60 74 61 75 END SUBROUTINE xios(set_axis_attr_hdl) 62 76 63 77 SUBROUTINE xios(set_axis_attr_hdl_) & 64 ( axis_hdl, axis_ref_, long_name_, name_, positive_, size_, standard_name_, unit_, value_, zoom_begin_ &65 , zoom_end_, zoom_size_ )78 ( axis_hdl, axis_ref_, data_begin_, data_index_, data_n_, ibegin_, long_name_, mask_, name_ & 79 , ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_, zoom_end_, zoom_size_ ) 66 80 67 81 IMPLICIT NONE 68 82 TYPE(txios(axis)) , INTENT(IN) :: axis_hdl 69 83 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref_ 84 INTEGER , OPTIONAL, INTENT(IN) :: data_begin_ 85 INTEGER , OPTIONAL, INTENT(IN) :: data_index_(:) 86 INTEGER , OPTIONAL, INTENT(IN) :: data_n_ 87 INTEGER , OPTIONAL, INTENT(IN) :: ibegin_ 70 88 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name_ 89 LOGICAL , OPTIONAL, INTENT(IN) :: mask_(:) 90 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:) 71 91 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 92 INTEGER , OPTIONAL, INTENT(IN) :: ni_ 72 93 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive_ 73 94 INTEGER , OPTIONAL, INTENT(IN) :: size_ … … 83 104 ENDIF 84 105 106 IF (PRESENT(data_begin_)) THEN 107 CALL cxios_set_axis_data_begin(axis_hdl%daddr, data_begin_) 108 ENDIF 109 110 IF (PRESENT(data_index_)) THEN 111 CALL cxios_set_axis_data_index(axis_hdl%daddr, data_index_,size(data_index_,1)) 112 ENDIF 113 114 IF (PRESENT(data_n_)) THEN 115 CALL cxios_set_axis_data_n(axis_hdl%daddr, data_n_) 116 ENDIF 117 118 IF (PRESENT(ibegin_)) THEN 119 CALL cxios_set_axis_ibegin(axis_hdl%daddr, ibegin_) 120 ENDIF 121 85 122 IF (PRESENT(long_name_)) THEN 86 123 CALL cxios_set_axis_long_name(axis_hdl%daddr, long_name_, len(long_name_)) 87 124 ENDIF 88 125 126 IF (PRESENT(mask_)) THEN 127 ALLOCATE(mask__tmp(size(mask_,1))) 128 mask__tmp=mask_ 129 CALL cxios_set_axis_mask(axis_hdl%daddr, mask__tmp,size(mask_,1)) 130 ENDIF 131 89 132 IF (PRESENT(name_)) THEN 90 133 CALL cxios_set_axis_name(axis_hdl%daddr, name_, len(name_)) 91 134 ENDIF 92 135 136 IF (PRESENT(ni_)) THEN 137 CALL cxios_set_axis_ni(axis_hdl%daddr, ni_) 138 ENDIF 139 93 140 IF (PRESENT(positive_)) THEN 94 141 CALL cxios_set_axis_positive(axis_hdl%daddr, positive_, len(positive_)) … … 128 175 129 176 SUBROUTINE xios(get_axis_attr) & 130 ( axis_id, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&131 , zoom_end, zoom_size )177 ( axis_id, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 178 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 132 179 133 180 IMPLICIT NONE … … 135 182 CHARACTER(LEN=*), INTENT(IN) ::axis_id 136 183 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 184 INTEGER , OPTIONAL, INTENT(OUT) :: data_begin 185 INTEGER , OPTIONAL, INTENT(OUT) :: data_index(:) 186 INTEGER , OPTIONAL, INTENT(OUT) :: data_n 187 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin 137 188 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 189 LOGICAL , OPTIONAL, INTENT(OUT) :: mask(:) 190 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 138 191 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 192 INTEGER , OPTIONAL, INTENT(OUT) :: ni 139 193 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive 140 194 INTEGER , OPTIONAL, INTENT(OUT) :: size … … 148 202 CALL xios(get_axis_handle)(axis_id,axis_hdl) 149 203 CALL xios(get_axis_attr_hdl_) & 150 ( axis_hdl, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&151 , zoom_end, zoom_size )204 ( axis_hdl, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 205 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 152 206 153 207 END SUBROUTINE xios(get_axis_attr) 154 208 155 209 SUBROUTINE xios(get_axis_attr_hdl) & 156 ( axis_hdl, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&157 , zoom_end, zoom_size )210 ( axis_hdl, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 211 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 158 212 159 213 IMPLICIT NONE 160 214 TYPE(txios(axis)) , INTENT(IN) :: axis_hdl 161 215 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 216 INTEGER , OPTIONAL, INTENT(OUT) :: data_begin 217 INTEGER , OPTIONAL, INTENT(OUT) :: data_index(:) 218 INTEGER , OPTIONAL, INTENT(OUT) :: data_n 219 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin 162 220 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 221 LOGICAL , OPTIONAL, INTENT(OUT) :: mask(:) 222 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 163 223 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 224 INTEGER , OPTIONAL, INTENT(OUT) :: ni 164 225 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive 165 226 INTEGER , OPTIONAL, INTENT(OUT) :: size … … 172 233 173 234 CALL xios(get_axis_attr_hdl_) & 174 ( axis_hdl, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&175 , zoom_end, zoom_size )235 ( axis_hdl, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 236 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 176 237 177 238 END SUBROUTINE xios(get_axis_attr_hdl) 178 239 179 240 SUBROUTINE xios(get_axis_attr_hdl_) & 180 ( axis_hdl, axis_ref_, long_name_, name_, positive_, size_, standard_name_, unit_, value_, zoom_begin_ &181 , zoom_end_, zoom_size_ )241 ( axis_hdl, axis_ref_, data_begin_, data_index_, data_n_, ibegin_, long_name_, mask_, name_ & 242 , ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_, zoom_end_, zoom_size_ ) 182 243 183 244 IMPLICIT NONE 184 245 TYPE(txios(axis)) , INTENT(IN) :: axis_hdl 185 246 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref_ 247 INTEGER , OPTIONAL, INTENT(OUT) :: data_begin_ 248 INTEGER , OPTIONAL, INTENT(OUT) :: data_index_(:) 249 INTEGER , OPTIONAL, INTENT(OUT) :: data_n_ 250 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin_ 186 251 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name_ 252 LOGICAL , OPTIONAL, INTENT(OUT) :: mask_(:) 253 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:) 187 254 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 255 INTEGER , OPTIONAL, INTENT(OUT) :: ni_ 188 256 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive_ 189 257 INTEGER , OPTIONAL, INTENT(OUT) :: size_ … … 199 267 ENDIF 200 268 269 IF (PRESENT(data_begin_)) THEN 270 CALL cxios_get_axis_data_begin(axis_hdl%daddr, data_begin_) 271 ENDIF 272 273 IF (PRESENT(data_index_)) THEN 274 CALL cxios_get_axis_data_index(axis_hdl%daddr, data_index_,size(data_index_,1)) 275 ENDIF 276 277 IF (PRESENT(data_n_)) THEN 278 CALL cxios_get_axis_data_n(axis_hdl%daddr, data_n_) 279 ENDIF 280 281 IF (PRESENT(ibegin_)) THEN 282 CALL cxios_get_axis_ibegin(axis_hdl%daddr, ibegin_) 283 ENDIF 284 201 285 IF (PRESENT(long_name_)) THEN 202 286 CALL cxios_get_axis_long_name(axis_hdl%daddr, long_name_, len(long_name_)) 203 287 ENDIF 204 288 289 IF (PRESENT(mask_)) THEN 290 ALLOCATE(mask__tmp(size(mask_,1))) 291 CALL cxios_get_axis_mask(axis_hdl%daddr, mask__tmp,size(mask_,1)) 292 mask_=mask__tmp_ 293 ENDIF 294 205 295 IF (PRESENT(name_)) THEN 206 296 CALL cxios_get_axis_name(axis_hdl%daddr, name_, len(name_)) 207 297 ENDIF 208 298 299 IF (PRESENT(ni_)) THEN 300 CALL cxios_get_axis_ni(axis_hdl%daddr, ni_) 301 ENDIF 302 209 303 IF (PRESENT(positive_)) THEN 210 304 CALL cxios_get_axis_positive(axis_hdl%daddr, positive_, len(positive_)) … … 244 338 245 339 SUBROUTINE xios(is_defined_axis_attr) & 246 ( axis_id, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&247 , zoom_end, zoom_size )340 ( axis_id, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 341 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 248 342 249 343 IMPLICIT NONE … … 252 346 LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 253 347 LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 348 LOGICAL, OPTIONAL, INTENT(OUT) :: data_begin 349 LOGICAL(KIND=C_BOOL) :: data_begin_tmp 350 LOGICAL, OPTIONAL, INTENT(OUT) :: data_index 351 LOGICAL(KIND=C_BOOL) :: data_index_tmp 352 LOGICAL, OPTIONAL, INTENT(OUT) :: data_n 353 LOGICAL(KIND=C_BOOL) :: data_n_tmp 354 LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin 355 LOGICAL(KIND=C_BOOL) :: ibegin_tmp 254 356 LOGICAL, OPTIONAL, INTENT(OUT) :: long_name 255 357 LOGICAL(KIND=C_BOOL) :: long_name_tmp 358 LOGICAL, OPTIONAL, INTENT(OUT) :: mask 359 LOGICAL(KIND=C_BOOL) :: mask_tmp 256 360 LOGICAL, OPTIONAL, INTENT(OUT) :: name 257 361 LOGICAL(KIND=C_BOOL) :: name_tmp 362 LOGICAL, OPTIONAL, INTENT(OUT) :: ni 363 LOGICAL(KIND=C_BOOL) :: ni_tmp 258 364 LOGICAL, OPTIONAL, INTENT(OUT) :: positive 259 365 LOGICAL(KIND=C_BOOL) :: positive_tmp … … 275 381 CALL xios(get_axis_handle)(axis_id,axis_hdl) 276 382 CALL xios(is_defined_axis_attr_hdl_) & 277 ( axis_hdl, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&278 , zoom_end, zoom_size )383 ( axis_hdl, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 384 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 279 385 280 386 END SUBROUTINE xios(is_defined_axis_attr) 281 387 282 388 SUBROUTINE xios(is_defined_axis_attr_hdl) & 283 ( axis_hdl, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&284 , zoom_end, zoom_size )389 ( axis_hdl, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 390 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 285 391 286 392 IMPLICIT NONE … … 288 394 LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 289 395 LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 396 LOGICAL, OPTIONAL, INTENT(OUT) :: data_begin 397 LOGICAL(KIND=C_BOOL) :: data_begin_tmp 398 LOGICAL, OPTIONAL, INTENT(OUT) :: data_index 399 LOGICAL(KIND=C_BOOL) :: data_index_tmp 400 LOGICAL, OPTIONAL, INTENT(OUT) :: data_n 401 LOGICAL(KIND=C_BOOL) :: data_n_tmp 402 LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin 403 LOGICAL(KIND=C_BOOL) :: ibegin_tmp 290 404 LOGICAL, OPTIONAL, INTENT(OUT) :: long_name 291 405 LOGICAL(KIND=C_BOOL) :: long_name_tmp 406 LOGICAL, OPTIONAL, INTENT(OUT) :: mask 407 LOGICAL(KIND=C_BOOL) :: mask_tmp 292 408 LOGICAL, OPTIONAL, INTENT(OUT) :: name 293 409 LOGICAL(KIND=C_BOOL) :: name_tmp 410 LOGICAL, OPTIONAL, INTENT(OUT) :: ni 411 LOGICAL(KIND=C_BOOL) :: ni_tmp 294 412 LOGICAL, OPTIONAL, INTENT(OUT) :: positive 295 413 LOGICAL(KIND=C_BOOL) :: positive_tmp … … 310 428 311 429 CALL xios(is_defined_axis_attr_hdl_) & 312 ( axis_hdl, axis_ref, long_name, name, positive, size, standard_name, unit, value, zoom_begin&313 , zoom_end, zoom_size )430 ( axis_hdl, axis_ref, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni, positive & 431 , size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 314 432 315 433 END SUBROUTINE xios(is_defined_axis_attr_hdl) 316 434 317 435 SUBROUTINE xios(is_defined_axis_attr_hdl_) & 318 ( axis_hdl, axis_ref_, long_name_, name_, positive_, size_, standard_name_, unit_, value_, zoom_begin_ &319 , zoom_end_, zoom_size_ )436 ( axis_hdl, axis_ref_, data_begin_, data_index_, data_n_, ibegin_, long_name_, mask_, name_ & 437 , ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_, zoom_end_, zoom_size_ ) 320 438 321 439 IMPLICIT NONE … … 323 441 LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref_ 324 442 LOGICAL(KIND=C_BOOL) :: axis_ref__tmp 443 LOGICAL, OPTIONAL, INTENT(OUT) :: data_begin_ 444 LOGICAL(KIND=C_BOOL) :: data_begin__tmp 445 LOGICAL, OPTIONAL, INTENT(OUT) :: data_index_ 446 LOGICAL(KIND=C_BOOL) :: data_index__tmp 447 LOGICAL, OPTIONAL, INTENT(OUT) :: data_n_ 448 LOGICAL(KIND=C_BOOL) :: data_n__tmp 449 LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin_ 450 LOGICAL(KIND=C_BOOL) :: ibegin__tmp 325 451 LOGICAL, OPTIONAL, INTENT(OUT) :: long_name_ 326 452 LOGICAL(KIND=C_BOOL) :: long_name__tmp 453 LOGICAL, OPTIONAL, INTENT(OUT) :: mask_ 454 LOGICAL(KIND=C_BOOL) :: mask__tmp 327 455 LOGICAL, OPTIONAL, INTENT(OUT) :: name_ 328 456 LOGICAL(KIND=C_BOOL) :: name__tmp 457 LOGICAL, OPTIONAL, INTENT(OUT) :: ni_ 458 LOGICAL(KIND=C_BOOL) :: ni__tmp 329 459 LOGICAL, OPTIONAL, INTENT(OUT) :: positive_ 330 460 LOGICAL(KIND=C_BOOL) :: positive__tmp … … 349 479 ENDIF 350 480 481 IF (PRESENT(data_begin_)) THEN 482 data_begin__tmp=cxios_is_defined_axis_data_begin(axis_hdl%daddr) 483 data_begin_=data_begin__tmp 484 ENDIF 485 486 IF (PRESENT(data_index_)) THEN 487 data_index__tmp=cxios_is_defined_axis_data_index(axis_hdl%daddr) 488 data_index_=data_index__tmp 489 ENDIF 490 491 IF (PRESENT(data_n_)) THEN 492 data_n__tmp=cxios_is_defined_axis_data_n(axis_hdl%daddr) 493 data_n_=data_n__tmp 494 ENDIF 495 496 IF (PRESENT(ibegin_)) THEN 497 ibegin__tmp=cxios_is_defined_axis_ibegin(axis_hdl%daddr) 498 ibegin_=ibegin__tmp 499 ENDIF 500 351 501 IF (PRESENT(long_name_)) THEN 352 502 long_name__tmp=cxios_is_defined_axis_long_name(axis_hdl%daddr) … … 354 504 ENDIF 355 505 506 IF (PRESENT(mask_)) THEN 507 mask__tmp=cxios_is_defined_axis_mask(axis_hdl%daddr) 508 mask_=mask__tmp 509 ENDIF 510 356 511 IF (PRESENT(name_)) THEN 357 512 name__tmp=cxios_is_defined_axis_name(axis_hdl%daddr) … … 359 514 ENDIF 360 515 516 IF (PRESENT(ni_)) THEN 517 ni__tmp=cxios_is_defined_axis_ni(axis_hdl%daddr) 518 ni_=ni__tmp 519 ENDIF 520 361 521 IF (PRESENT(positive_)) THEN 362 522 positive__tmp=cxios_is_defined_axis_positive(axis_hdl%daddr) -
XIOS/trunk/src/interface/fortran_attr/iaxisgroup_attr.F90
r546 r555 12 12 13 13 SUBROUTINE xios(set_axisgroup_attr) & 14 ( axisgroup_id, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&15 , zoom_begin, zoom_end, zoom_size )14 ( axisgroup_id, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 15 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 16 16 17 17 IMPLICIT NONE … … 19 19 CHARACTER(LEN=*), INTENT(IN) ::axisgroup_id 20 20 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 21 INTEGER , OPTIONAL, INTENT(IN) :: data_begin 22 INTEGER , OPTIONAL, INTENT(IN) :: data_index(:) 23 INTEGER , OPTIONAL, INTENT(IN) :: data_n 21 24 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 25 INTEGER , OPTIONAL, INTENT(IN) :: ibegin 22 26 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 27 LOGICAL , OPTIONAL, INTENT(IN) :: mask(:) 28 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 23 29 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 30 INTEGER , OPTIONAL, INTENT(IN) :: ni 24 31 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive 25 32 INTEGER , OPTIONAL, INTENT(IN) :: size … … 33 40 CALL xios(get_axisgroup_handle)(axisgroup_id,axisgroup_hdl) 34 41 CALL xios(set_axisgroup_attr_hdl_) & 35 ( axisgroup_hdl, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&36 , zoom_begin, zoom_end, zoom_size )42 ( axisgroup_hdl, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 43 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 37 44 38 45 END SUBROUTINE xios(set_axisgroup_attr) 39 46 40 47 SUBROUTINE xios(set_axisgroup_attr_hdl) & 41 ( axisgroup_hdl, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&42 , zoom_begin, zoom_end, zoom_size )48 ( axisgroup_hdl, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 49 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 43 50 44 51 IMPLICIT NONE 45 52 TYPE(txios(axisgroup)) , INTENT(IN) :: axisgroup_hdl 46 53 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 54 INTEGER , OPTIONAL, INTENT(IN) :: data_begin 55 INTEGER , OPTIONAL, INTENT(IN) :: data_index(:) 56 INTEGER , OPTIONAL, INTENT(IN) :: data_n 47 57 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 58 INTEGER , OPTIONAL, INTENT(IN) :: ibegin 48 59 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 60 LOGICAL , OPTIONAL, INTENT(IN) :: mask(:) 61 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 49 62 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 63 INTEGER , OPTIONAL, INTENT(IN) :: ni 50 64 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive 51 65 INTEGER , OPTIONAL, INTENT(IN) :: size … … 58 72 59 73 CALL xios(set_axisgroup_attr_hdl_) & 60 ( axisgroup_hdl, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&61 , zoom_begin, zoom_end, zoom_size )74 ( axisgroup_hdl, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 75 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 62 76 63 77 END SUBROUTINE xios(set_axisgroup_attr_hdl) 64 78 65 79 SUBROUTINE xios(set_axisgroup_attr_hdl_) & 66 ( axisgroup_hdl, axis_ref_, group_ref_, long_name_, name_, positive_, size_, standard_name_ & 67 , unit_, value_, zoom_begin_, zoom_end_, zoom_size_ ) 80 ( axisgroup_hdl, axis_ref_, data_begin_, data_index_, data_n_, group_ref_, ibegin_, long_name_ & 81 , mask_, name_, ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_, zoom_end_ & 82 , zoom_size_ ) 68 83 69 84 IMPLICIT NONE 70 85 TYPE(txios(axisgroup)) , INTENT(IN) :: axisgroup_hdl 71 86 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref_ 87 INTEGER , OPTIONAL, INTENT(IN) :: data_begin_ 88 INTEGER , OPTIONAL, INTENT(IN) :: data_index_(:) 89 INTEGER , OPTIONAL, INTENT(IN) :: data_n_ 72 90 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 91 INTEGER , OPTIONAL, INTENT(IN) :: ibegin_ 73 92 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name_ 93 LOGICAL , OPTIONAL, INTENT(IN) :: mask_(:) 94 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:) 74 95 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 96 INTEGER , OPTIONAL, INTENT(IN) :: ni_ 75 97 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive_ 76 98 INTEGER , OPTIONAL, INTENT(IN) :: size_ … … 86 108 ENDIF 87 109 110 IF (PRESENT(data_begin_)) THEN 111 CALL cxios_set_axisgroup_data_begin(axisgroup_hdl%daddr, data_begin_) 112 ENDIF 113 114 IF (PRESENT(data_index_)) THEN 115 CALL cxios_set_axisgroup_data_index(axisgroup_hdl%daddr, data_index_,size(data_index_,1)) 116 ENDIF 117 118 IF (PRESENT(data_n_)) THEN 119 CALL cxios_set_axisgroup_data_n(axisgroup_hdl%daddr, data_n_) 120 ENDIF 121 88 122 IF (PRESENT(group_ref_)) THEN 89 123 CALL cxios_set_axisgroup_group_ref(axisgroup_hdl%daddr, group_ref_, len(group_ref_)) 90 124 ENDIF 91 125 126 IF (PRESENT(ibegin_)) THEN 127 CALL cxios_set_axisgroup_ibegin(axisgroup_hdl%daddr, ibegin_) 128 ENDIF 129 92 130 IF (PRESENT(long_name_)) THEN 93 131 CALL cxios_set_axisgroup_long_name(axisgroup_hdl%daddr, long_name_, len(long_name_)) 94 132 ENDIF 95 133 134 IF (PRESENT(mask_)) THEN 135 ALLOCATE(mask__tmp(size(mask_,1))) 136 mask__tmp=mask_ 137 CALL cxios_set_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp,size(mask_,1)) 138 ENDIF 139 96 140 IF (PRESENT(name_)) THEN 97 141 CALL cxios_set_axisgroup_name(axisgroup_hdl%daddr, name_, len(name_)) 98 142 ENDIF 99 143 144 IF (PRESENT(ni_)) THEN 145 CALL cxios_set_axisgroup_ni(axisgroup_hdl%daddr, ni_) 146 ENDIF 147 100 148 IF (PRESENT(positive_)) THEN 101 149 CALL cxios_set_axisgroup_positive(axisgroup_hdl%daddr, positive_, len(positive_)) … … 135 183 136 184 SUBROUTINE xios(get_axisgroup_attr) & 137 ( axisgroup_id, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&138 , zoom_begin, zoom_end, zoom_size )185 ( axisgroup_id, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 186 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 139 187 140 188 IMPLICIT NONE … … 142 190 CHARACTER(LEN=*), INTENT(IN) ::axisgroup_id 143 191 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 192 INTEGER , OPTIONAL, INTENT(OUT) :: data_begin 193 INTEGER , OPTIONAL, INTENT(OUT) :: data_index(:) 194 INTEGER , OPTIONAL, INTENT(OUT) :: data_n 144 195 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 196 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin 145 197 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 198 LOGICAL , OPTIONAL, INTENT(OUT) :: mask(:) 199 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 146 200 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 201 INTEGER , OPTIONAL, INTENT(OUT) :: ni 147 202 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive 148 203 INTEGER , OPTIONAL, INTENT(OUT) :: size … … 156 211 CALL xios(get_axisgroup_handle)(axisgroup_id,axisgroup_hdl) 157 212 CALL xios(get_axisgroup_attr_hdl_) & 158 ( axisgroup_hdl, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&159 , zoom_begin, zoom_end, zoom_size )213 ( axisgroup_hdl, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 214 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 160 215 161 216 END SUBROUTINE xios(get_axisgroup_attr) 162 217 163 218 SUBROUTINE xios(get_axisgroup_attr_hdl) & 164 ( axisgroup_hdl, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&165 , zoom_begin, zoom_end, zoom_size )219 ( axisgroup_hdl, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 220 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 166 221 167 222 IMPLICIT NONE 168 223 TYPE(txios(axisgroup)) , INTENT(IN) :: axisgroup_hdl 169 224 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 225 INTEGER , OPTIONAL, INTENT(OUT) :: data_begin 226 INTEGER , OPTIONAL, INTENT(OUT) :: data_index(:) 227 INTEGER , OPTIONAL, INTENT(OUT) :: data_n 170 228 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 229 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin 171 230 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 231 LOGICAL , OPTIONAL, INTENT(OUT) :: mask(:) 232 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 172 233 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 234 INTEGER , OPTIONAL, INTENT(OUT) :: ni 173 235 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive 174 236 INTEGER , OPTIONAL, INTENT(OUT) :: size … … 181 243 182 244 CALL xios(get_axisgroup_attr_hdl_) & 183 ( axisgroup_hdl, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&184 , zoom_begin, zoom_end, zoom_size )245 ( axisgroup_hdl, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 246 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 185 247 186 248 END SUBROUTINE xios(get_axisgroup_attr_hdl) 187 249 188 250 SUBROUTINE xios(get_axisgroup_attr_hdl_) & 189 ( axisgroup_hdl, axis_ref_, group_ref_, long_name_, name_, positive_, size_, standard_name_ & 190 , unit_, value_, zoom_begin_, zoom_end_, zoom_size_ ) 251 ( axisgroup_hdl, axis_ref_, data_begin_, data_index_, data_n_, group_ref_, ibegin_, long_name_ & 252 , mask_, name_, ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_, zoom_end_ & 253 , zoom_size_ ) 191 254 192 255 IMPLICIT NONE 193 256 TYPE(txios(axisgroup)) , INTENT(IN) :: axisgroup_hdl 194 257 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref_ 258 INTEGER , OPTIONAL, INTENT(OUT) :: data_begin_ 259 INTEGER , OPTIONAL, INTENT(OUT) :: data_index_(:) 260 INTEGER , OPTIONAL, INTENT(OUT) :: data_n_ 195 261 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 262 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin_ 196 263 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name_ 264 LOGICAL , OPTIONAL, INTENT(OUT) :: mask_(:) 265 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:) 197 266 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 267 INTEGER , OPTIONAL, INTENT(OUT) :: ni_ 198 268 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive_ 199 269 INTEGER , OPTIONAL, INTENT(OUT) :: size_ … … 209 279 ENDIF 210 280 281 IF (PRESENT(data_begin_)) THEN 282 CALL cxios_get_axisgroup_data_begin(axisgroup_hdl%daddr, data_begin_) 283 ENDIF 284 285 IF (PRESENT(data_index_)) THEN 286 CALL cxios_get_axisgroup_data_index(axisgroup_hdl%daddr, data_index_,size(data_index_,1)) 287 ENDIF 288 289 IF (PRESENT(data_n_)) THEN 290 CALL cxios_get_axisgroup_data_n(axisgroup_hdl%daddr, data_n_) 291 ENDIF 292 211 293 IF (PRESENT(group_ref_)) THEN 212 294 CALL cxios_get_axisgroup_group_ref(axisgroup_hdl%daddr, group_ref_, len(group_ref_)) 213 295 ENDIF 214 296 297 IF (PRESENT(ibegin_)) THEN 298 CALL cxios_get_axisgroup_ibegin(axisgroup_hdl%daddr, ibegin_) 299 ENDIF 300 215 301 IF (PRESENT(long_name_)) THEN 216 302 CALL cxios_get_axisgroup_long_name(axisgroup_hdl%daddr, long_name_, len(long_name_)) 217 303 ENDIF 218 304 305 IF (PRESENT(mask_)) THEN 306 ALLOCATE(mask__tmp(size(mask_,1))) 307 CALL cxios_get_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp,size(mask_,1)) 308 mask_=mask__tmp_ 309 ENDIF 310 219 311 IF (PRESENT(name_)) THEN 220 312 CALL cxios_get_axisgroup_name(axisgroup_hdl%daddr, name_, len(name_)) 221 313 ENDIF 222 314 315 IF (PRESENT(ni_)) THEN 316 CALL cxios_get_axisgroup_ni(axisgroup_hdl%daddr, ni_) 317 ENDIF 318 223 319 IF (PRESENT(positive_)) THEN 224 320 CALL cxios_get_axisgroup_positive(axisgroup_hdl%daddr, positive_, len(positive_)) … … 258 354 259 355 SUBROUTINE xios(is_defined_axisgroup_attr) & 260 ( axisgroup_id, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&261 , zoom_begin, zoom_end, zoom_size )356 ( axisgroup_id, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 357 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 262 358 263 359 IMPLICIT NONE … … 266 362 LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 267 363 LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 364 LOGICAL, OPTIONAL, INTENT(OUT) :: data_begin 365 LOGICAL(KIND=C_BOOL) :: data_begin_tmp 366 LOGICAL, OPTIONAL, INTENT(OUT) :: data_index 367 LOGICAL(KIND=C_BOOL) :: data_index_tmp 368 LOGICAL, OPTIONAL, INTENT(OUT) :: data_n 369 LOGICAL(KIND=C_BOOL) :: data_n_tmp 268 370 LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 269 371 LOGICAL(KIND=C_BOOL) :: group_ref_tmp 372 LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin 373 LOGICAL(KIND=C_BOOL) :: ibegin_tmp 270 374 LOGICAL, OPTIONAL, INTENT(OUT) :: long_name 271 375 LOGICAL(KIND=C_BOOL) :: long_name_tmp 376 LOGICAL, OPTIONAL, INTENT(OUT) :: mask 377 LOGICAL(KIND=C_BOOL) :: mask_tmp 272 378 LOGICAL, OPTIONAL, INTENT(OUT) :: name 273 379 LOGICAL(KIND=C_BOOL) :: name_tmp 380 LOGICAL, OPTIONAL, INTENT(OUT) :: ni 381 LOGICAL(KIND=C_BOOL) :: ni_tmp 274 382 LOGICAL, OPTIONAL, INTENT(OUT) :: positive 275 383 LOGICAL(KIND=C_BOOL) :: positive_tmp … … 291 399 CALL xios(get_axisgroup_handle)(axisgroup_id,axisgroup_hdl) 292 400 CALL xios(is_defined_axisgroup_attr_hdl_) & 293 ( axisgroup_hdl, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&294 , zoom_begin, zoom_end, zoom_size )401 ( axisgroup_hdl, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 402 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 295 403 296 404 END SUBROUTINE xios(is_defined_axisgroup_attr) 297 405 298 406 SUBROUTINE xios(is_defined_axisgroup_attr_hdl) & 299 ( axisgroup_hdl, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&300 , zoom_begin, zoom_end, zoom_size )407 ( axisgroup_hdl, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 408 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 301 409 302 410 IMPLICIT NONE … … 304 412 LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 305 413 LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 414 LOGICAL, OPTIONAL, INTENT(OUT) :: data_begin 415 LOGICAL(KIND=C_BOOL) :: data_begin_tmp 416 LOGICAL, OPTIONAL, INTENT(OUT) :: data_index 417 LOGICAL(KIND=C_BOOL) :: data_index_tmp 418 LOGICAL, OPTIONAL, INTENT(OUT) :: data_n 419 LOGICAL(KIND=C_BOOL) :: data_n_tmp 306 420 LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 307 421 LOGICAL(KIND=C_BOOL) :: group_ref_tmp 422 LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin 423 LOGICAL(KIND=C_BOOL) :: ibegin_tmp 308 424 LOGICAL, OPTIONAL, INTENT(OUT) :: long_name 309 425 LOGICAL(KIND=C_BOOL) :: long_name_tmp 426 LOGICAL, OPTIONAL, INTENT(OUT) :: mask 427 LOGICAL(KIND=C_BOOL) :: mask_tmp 310 428 LOGICAL, OPTIONAL, INTENT(OUT) :: name 311 429 LOGICAL(KIND=C_BOOL) :: name_tmp 430 LOGICAL, OPTIONAL, INTENT(OUT) :: ni 431 LOGICAL(KIND=C_BOOL) :: ni_tmp 312 432 LOGICAL, OPTIONAL, INTENT(OUT) :: positive 313 433 LOGICAL(KIND=C_BOOL) :: positive_tmp … … 328 448 329 449 CALL xios(is_defined_axisgroup_attr_hdl_) & 330 ( axisgroup_hdl, axis_ref, group_ref, long_name, name, positive, size, standard_name, unit, value&331 , zoom_begin, zoom_end, zoom_size )450 ( axisgroup_hdl, axis_ref, data_begin, data_index, data_n, group_ref, ibegin, long_name, mask & 451 , name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size ) 332 452 333 453 END SUBROUTINE xios(is_defined_axisgroup_attr_hdl) 334 454 335 455 SUBROUTINE xios(is_defined_axisgroup_attr_hdl_) & 336 ( axisgroup_hdl, axis_ref_, group_ref_, long_name_, name_, positive_, size_, standard_name_ & 337 , unit_, value_, zoom_begin_, zoom_end_, zoom_size_ ) 456 ( axisgroup_hdl, axis_ref_, data_begin_, data_index_, data_n_, group_ref_, ibegin_, long_name_ & 457 , mask_, name_, ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_, zoom_end_ & 458 , zoom_size_ ) 338 459 339 460 IMPLICIT NONE … … 341 462 LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref_ 342 463 LOGICAL(KIND=C_BOOL) :: axis_ref__tmp 464 LOGICAL, OPTIONAL, INTENT(OUT) :: data_begin_ 465 LOGICAL(KIND=C_BOOL) :: data_begin__tmp 466 LOGICAL, OPTIONAL, INTENT(OUT) :: data_index_ 467 LOGICAL(KIND=C_BOOL) :: data_index__tmp 468 LOGICAL, OPTIONAL, INTENT(OUT) :: data_n_ 469 LOGICAL(KIND=C_BOOL) :: data_n__tmp 343 470 LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref_ 344 471 LOGICAL(KIND=C_BOOL) :: group_ref__tmp 472 LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin_ 473 LOGICAL(KIND=C_BOOL) :: ibegin__tmp 345 474 LOGICAL, OPTIONAL, INTENT(OUT) :: long_name_ 346 475 LOGICAL(KIND=C_BOOL) :: long_name__tmp 476 LOGICAL, OPTIONAL, INTENT(OUT) :: mask_ 477 LOGICAL(KIND=C_BOOL) :: mask__tmp 347 478 LOGICAL, OPTIONAL, INTENT(OUT) :: name_ 348 479 LOGICAL(KIND=C_BOOL) :: name__tmp 480 LOGICAL, OPTIONAL, INTENT(OUT) :: ni_ 481 LOGICAL(KIND=C_BOOL) :: ni__tmp 349 482 LOGICAL, OPTIONAL, INTENT(OUT) :: positive_ 350 483 LOGICAL(KIND=C_BOOL) :: positive__tmp … … 369 502 ENDIF 370 503 504 IF (PRESENT(data_begin_)) THEN 505 data_begin__tmp=cxios_is_defined_axisgroup_data_begin(axisgroup_hdl%daddr) 506 data_begin_=data_begin__tmp 507 ENDIF 508 509 IF (PRESENT(data_index_)) THEN 510 data_index__tmp=cxios_is_defined_axisgroup_data_index(axisgroup_hdl%daddr) 511 data_index_=data_index__tmp 512 ENDIF 513 514 IF (PRESENT(data_n_)) THEN 515 data_n__tmp=cxios_is_defined_axisgroup_data_n(axisgroup_hdl%daddr) 516 data_n_=data_n__tmp 517 ENDIF 518 371 519 IF (PRESENT(group_ref_)) THEN 372 520 group_ref__tmp=cxios_is_defined_axisgroup_group_ref(axisgroup_hdl%daddr) … … 374 522 ENDIF 375 523 524 IF (PRESENT(ibegin_)) THEN 525 ibegin__tmp=cxios_is_defined_axisgroup_ibegin(axisgroup_hdl%daddr) 526 ibegin_=ibegin__tmp 527 ENDIF 528 376 529 IF (PRESENT(long_name_)) THEN 377 530 long_name__tmp=cxios_is_defined_axisgroup_long_name(axisgroup_hdl%daddr) … … 379 532 ENDIF 380 533 534 IF (PRESENT(mask_)) THEN 535 mask__tmp=cxios_is_defined_axisgroup_mask(axisgroup_hdl%daddr) 536 mask_=mask__tmp 537 ENDIF 538 381 539 IF (PRESENT(name_)) THEN 382 540 name__tmp=cxios_is_defined_axisgroup_name(axisgroup_hdl%daddr) … … 384 542 ENDIF 385 543 544 IF (PRESENT(ni_)) THEN 545 ni__tmp=cxios_is_defined_axisgroup_ni(axisgroup_hdl%daddr) 546 ni_=ni__tmp 547 ENDIF 548 386 549 IF (PRESENT(positive_)) THEN 387 550 positive__tmp=cxios_is_defined_axisgroup_positive(axisgroup_hdl%daddr) -
XIOS/trunk/src/interface/fortran_attr/igrid_attr.F90
r546 r555 12 12 13 13 SUBROUTINE xios(set_grid_attr) & 14 ( grid_id, axisDom Order, description, mask, name )14 ( grid_id, axisDomainOrder, description, mask, name ) 15 15 16 16 IMPLICIT NONE 17 17 TYPE(txios(grid)) :: grid_hdl 18 18 CHARACTER(LEN=*), INTENT(IN) ::grid_id 19 INTEGER , OPTIONAL, INTENT(IN) :: axisDomOrder(:) 19 LOGICAL , OPTIONAL, INTENT(IN) :: axisDomainOrder(:) 20 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 20 21 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 21 22 LOGICAL , OPTIONAL, INTENT(IN) :: mask(:,:,:) … … 25 26 CALL xios(get_grid_handle)(grid_id,grid_hdl) 26 27 CALL xios(set_grid_attr_hdl_) & 27 ( grid_hdl, axisDom Order, description, mask, name )28 ( grid_hdl, axisDomainOrder, description, mask, name ) 28 29 29 30 END SUBROUTINE xios(set_grid_attr) 30 31 31 32 SUBROUTINE xios(set_grid_attr_hdl) & 32 ( grid_hdl, axisDomOrder, description, mask, name ) 33 34 IMPLICIT NONE 35 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 36 INTEGER , OPTIONAL, INTENT(IN) :: axisDomOrder(:) 33 ( grid_hdl, axisDomainOrder, description, mask, name ) 34 35 IMPLICIT NONE 36 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 37 LOGICAL , OPTIONAL, INTENT(IN) :: axisDomainOrder(:) 38 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 37 39 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 38 40 LOGICAL , OPTIONAL, INTENT(IN) :: mask(:,:,:) … … 41 43 42 44 CALL xios(set_grid_attr_hdl_) & 43 ( grid_hdl, axisDom Order, description, mask, name )45 ( grid_hdl, axisDomainOrder, description, mask, name ) 44 46 45 47 END SUBROUTINE xios(set_grid_attr_hdl) 46 48 47 49 SUBROUTINE xios(set_grid_attr_hdl_) & 48 ( grid_hdl, axisDomOrder_, description_, mask_, name_ ) 49 50 IMPLICIT NONE 51 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 52 INTEGER , OPTIONAL, INTENT(IN) :: axisDomOrder_(:) 50 ( grid_hdl, axisDomainOrder_, description_, mask_, name_ ) 51 52 IMPLICIT NONE 53 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 54 LOGICAL , OPTIONAL, INTENT(IN) :: axisDomainOrder_(:) 55 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 53 56 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 54 57 LOGICAL , OPTIONAL, INTENT(IN) :: mask_(:,:,:) … … 56 59 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 57 60 58 IF (PRESENT(axisDomOrder_)) THEN 59 CALL cxios_set_grid_axisDomOrder(grid_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 61 IF (PRESENT(axisDomainOrder_)) THEN 62 ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 63 axisDomainOrder__tmp=axisDomainOrder_ 64 CALL cxios_set_grid_axisDomainOrder(grid_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 60 65 ENDIF 61 66 … … 79 84 80 85 SUBROUTINE xios(get_grid_attr) & 81 ( grid_id, axisDom Order, description, mask, name )86 ( grid_id, axisDomainOrder, description, mask, name ) 82 87 83 88 IMPLICIT NONE 84 89 TYPE(txios(grid)) :: grid_hdl 85 90 CHARACTER(LEN=*), INTENT(IN) ::grid_id 86 INTEGER , OPTIONAL, INTENT(OUT) :: axisDomOrder(:) 91 LOGICAL , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 92 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 87 93 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 88 94 LOGICAL , OPTIONAL, INTENT(OUT) :: mask(:,:,:) … … 92 98 CALL xios(get_grid_handle)(grid_id,grid_hdl) 93 99 CALL xios(get_grid_attr_hdl_) & 94 ( grid_hdl, axisDom Order, description, mask, name )100 ( grid_hdl, axisDomainOrder, description, mask, name ) 95 101 96 102 END SUBROUTINE xios(get_grid_attr) 97 103 98 104 SUBROUTINE xios(get_grid_attr_hdl) & 99 ( grid_hdl, axisDomOrder, description, mask, name ) 100 101 IMPLICIT NONE 102 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 103 INTEGER , OPTIONAL, INTENT(OUT) :: axisDomOrder(:) 105 ( grid_hdl, axisDomainOrder, description, mask, name ) 106 107 IMPLICIT NONE 108 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 109 LOGICAL , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 110 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 104 111 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 105 112 LOGICAL , OPTIONAL, INTENT(OUT) :: mask(:,:,:) … … 108 115 109 116 CALL xios(get_grid_attr_hdl_) & 110 ( grid_hdl, axisDom Order, description, mask, name )117 ( grid_hdl, axisDomainOrder, description, mask, name ) 111 118 112 119 END SUBROUTINE xios(get_grid_attr_hdl) 113 120 114 121 SUBROUTINE xios(get_grid_attr_hdl_) & 115 ( grid_hdl, axisDomOrder_, description_, mask_, name_ ) 116 117 IMPLICIT NONE 118 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 119 INTEGER , OPTIONAL, INTENT(OUT) :: axisDomOrder_(:) 122 ( grid_hdl, axisDomainOrder_, description_, mask_, name_ ) 123 124 IMPLICIT NONE 125 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 126 LOGICAL , OPTIONAL, INTENT(OUT) :: axisDomainOrder_(:) 127 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 120 128 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 121 129 LOGICAL , OPTIONAL, INTENT(OUT) :: mask_(:,:,:) … … 123 131 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 124 132 125 IF (PRESENT(axisDomOrder_)) THEN 126 CALL cxios_get_grid_axisDomOrder(grid_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 133 IF (PRESENT(axisDomainOrder_)) THEN 134 ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 135 CALL cxios_get_grid_axisDomainOrder(grid_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 136 axisDomainOrder_=axisDomainOrder__tmp_ 127 137 ENDIF 128 138 … … 146 156 147 157 SUBROUTINE xios(is_defined_grid_attr) & 148 ( grid_id, axisDom Order, description, mask, name )158 ( grid_id, axisDomainOrder, description, mask, name ) 149 159 150 160 IMPLICIT NONE 151 161 TYPE(txios(grid)) :: grid_hdl 152 162 CHARACTER(LEN=*), INTENT(IN) ::grid_id 153 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDom Order154 LOGICAL(KIND=C_BOOL) :: axisDom Order_tmp163 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 164 LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 155 165 LOGICAL, OPTIONAL, INTENT(OUT) :: description 156 166 LOGICAL(KIND=C_BOOL) :: description_tmp … … 162 172 CALL xios(get_grid_handle)(grid_id,grid_hdl) 163 173 CALL xios(is_defined_grid_attr_hdl_) & 164 ( grid_hdl, axisDom Order, description, mask, name )174 ( grid_hdl, axisDomainOrder, description, mask, name ) 165 175 166 176 END SUBROUTINE xios(is_defined_grid_attr) 167 177 168 178 SUBROUTINE xios(is_defined_grid_attr_hdl) & 169 ( grid_hdl, axisDom Order, description, mask, name )170 171 IMPLICIT NONE 172 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 173 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDom Order174 LOGICAL(KIND=C_BOOL) :: axisDom Order_tmp179 ( grid_hdl, axisDomainOrder, description, mask, name ) 180 181 IMPLICIT NONE 182 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 183 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 184 LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 175 185 LOGICAL, OPTIONAL, INTENT(OUT) :: description 176 186 LOGICAL(KIND=C_BOOL) :: description_tmp … … 181 191 182 192 CALL xios(is_defined_grid_attr_hdl_) & 183 ( grid_hdl, axisDom Order, description, mask, name )193 ( grid_hdl, axisDomainOrder, description, mask, name ) 184 194 185 195 END SUBROUTINE xios(is_defined_grid_attr_hdl) 186 196 187 197 SUBROUTINE xios(is_defined_grid_attr_hdl_) & 188 ( grid_hdl, axisDom Order_, description_, mask_, name_ )189 190 IMPLICIT NONE 191 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 192 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDom Order_193 LOGICAL(KIND=C_BOOL) :: axisDom Order__tmp198 ( grid_hdl, axisDomainOrder_, description_, mask_, name_ ) 199 200 IMPLICIT NONE 201 TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 202 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder_ 203 LOGICAL(KIND=C_BOOL) :: axisDomainOrder__tmp 194 204 LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 195 205 LOGICAL(KIND=C_BOOL) :: description__tmp … … 199 209 LOGICAL(KIND=C_BOOL) :: name__tmp 200 210 201 IF (PRESENT(axisDom Order_)) THEN202 axisDom Order__tmp=cxios_is_defined_grid_axisDomOrder(grid_hdl%daddr)203 axisDom Order_=axisDomOrder__tmp211 IF (PRESENT(axisDomainOrder_)) THEN 212 axisDomainOrder__tmp=cxios_is_defined_grid_axisDomainOrder(grid_hdl%daddr) 213 axisDomainOrder_=axisDomainOrder__tmp 204 214 ENDIF 205 215 -
XIOS/trunk/src/interface/fortran_attr/igridgroup_attr.F90
r546 r555 12 12 13 13 SUBROUTINE xios(set_gridgroup_attr) & 14 ( gridgroup_id, axisDom Order, description, group_ref, mask, name )14 ( gridgroup_id, axisDomainOrder, description, group_ref, mask, name ) 15 15 16 16 IMPLICIT NONE 17 17 TYPE(txios(gridgroup)) :: gridgroup_hdl 18 18 CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 19 INTEGER , OPTIONAL, INTENT(IN) :: axisDomOrder(:) 19 LOGICAL , OPTIONAL, INTENT(IN) :: axisDomainOrder(:) 20 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 20 21 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 21 22 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref … … 26 27 CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 27 28 CALL xios(set_gridgroup_attr_hdl_) & 28 ( gridgroup_hdl, axisDom Order, description, group_ref, mask, name )29 ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 29 30 30 31 END SUBROUTINE xios(set_gridgroup_attr) 31 32 32 33 SUBROUTINE xios(set_gridgroup_attr_hdl) & 33 ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 34 35 IMPLICIT NONE 36 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 37 INTEGER , OPTIONAL, INTENT(IN) :: axisDomOrder(:) 34 ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 35 36 IMPLICIT NONE 37 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 38 LOGICAL , OPTIONAL, INTENT(IN) :: axisDomainOrder(:) 39 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 38 40 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 39 41 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref … … 43 45 44 46 CALL xios(set_gridgroup_attr_hdl_) & 45 ( gridgroup_hdl, axisDom Order, description, group_ref, mask, name )47 ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 46 48 47 49 END SUBROUTINE xios(set_gridgroup_attr_hdl) 48 50 49 51 SUBROUTINE xios(set_gridgroup_attr_hdl_) & 50 ( gridgroup_hdl, axisDomOrder_, description_, group_ref_, mask_, name_ ) 51 52 IMPLICIT NONE 53 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 54 INTEGER , OPTIONAL, INTENT(IN) :: axisDomOrder_(:) 52 ( gridgroup_hdl, axisDomainOrder_, description_, group_ref_, mask_, name_ ) 53 54 IMPLICIT NONE 55 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 56 LOGICAL , OPTIONAL, INTENT(IN) :: axisDomainOrder_(:) 57 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 55 58 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 56 59 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ … … 59 62 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 60 63 61 IF (PRESENT(axisDomOrder_)) THEN 62 CALL cxios_set_gridgroup_axisDomOrder(gridgroup_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 64 IF (PRESENT(axisDomainOrder_)) THEN 65 ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 66 axisDomainOrder__tmp=axisDomainOrder_ 67 CALL cxios_set_gridgroup_axisDomainOrder(gridgroup_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 63 68 ENDIF 64 69 … … 86 91 87 92 SUBROUTINE xios(get_gridgroup_attr) & 88 ( gridgroup_id, axisDom Order, description, group_ref, mask, name )93 ( gridgroup_id, axisDomainOrder, description, group_ref, mask, name ) 89 94 90 95 IMPLICIT NONE 91 96 TYPE(txios(gridgroup)) :: gridgroup_hdl 92 97 CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 93 INTEGER , OPTIONAL, INTENT(OUT) :: axisDomOrder(:) 98 LOGICAL , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 99 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 94 100 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 95 101 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref … … 100 106 CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 101 107 CALL xios(get_gridgroup_attr_hdl_) & 102 ( gridgroup_hdl, axisDom Order, description, group_ref, mask, name )108 ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 103 109 104 110 END SUBROUTINE xios(get_gridgroup_attr) 105 111 106 112 SUBROUTINE xios(get_gridgroup_attr_hdl) & 107 ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 108 109 IMPLICIT NONE 110 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 111 INTEGER , OPTIONAL, INTENT(OUT) :: axisDomOrder(:) 113 ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 114 115 IMPLICIT NONE 116 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 117 LOGICAL , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 118 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 112 119 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 113 120 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref … … 117 124 118 125 CALL xios(get_gridgroup_attr_hdl_) & 119 ( gridgroup_hdl, axisDom Order, description, group_ref, mask, name )126 ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 120 127 121 128 END SUBROUTINE xios(get_gridgroup_attr_hdl) 122 129 123 130 SUBROUTINE xios(get_gridgroup_attr_hdl_) & 124 ( gridgroup_hdl, axisDomOrder_, description_, group_ref_, mask_, name_ ) 125 126 IMPLICIT NONE 127 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 128 INTEGER , OPTIONAL, INTENT(OUT) :: axisDomOrder_(:) 131 ( gridgroup_hdl, axisDomainOrder_, description_, group_ref_, mask_, name_ ) 132 133 IMPLICIT NONE 134 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 135 LOGICAL , OPTIONAL, INTENT(OUT) :: axisDomainOrder_(:) 136 LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 129 137 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 130 138 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ … … 133 141 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 134 142 135 IF (PRESENT(axisDomOrder_)) THEN 136 CALL cxios_get_gridgroup_axisDomOrder(gridgroup_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 143 IF (PRESENT(axisDomainOrder_)) THEN 144 ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 145 CALL cxios_get_gridgroup_axisDomainOrder(gridgroup_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 146 axisDomainOrder_=axisDomainOrder__tmp_ 137 147 ENDIF 138 148 … … 160 170 161 171 SUBROUTINE xios(is_defined_gridgroup_attr) & 162 ( gridgroup_id, axisDom Order, description, group_ref, mask, name )172 ( gridgroup_id, axisDomainOrder, description, group_ref, mask, name ) 163 173 164 174 IMPLICIT NONE 165 175 TYPE(txios(gridgroup)) :: gridgroup_hdl 166 176 CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 167 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDom Order168 LOGICAL(KIND=C_BOOL) :: axisDom Order_tmp177 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 178 LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 169 179 LOGICAL, OPTIONAL, INTENT(OUT) :: description 170 180 LOGICAL(KIND=C_BOOL) :: description_tmp … … 178 188 CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 179 189 CALL xios(is_defined_gridgroup_attr_hdl_) & 180 ( gridgroup_hdl, axisDom Order, description, group_ref, mask, name )190 ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 181 191 182 192 END SUBROUTINE xios(is_defined_gridgroup_attr) 183 193 184 194 SUBROUTINE xios(is_defined_gridgroup_attr_hdl) & 185 ( gridgroup_hdl, axisDom Order, description, group_ref, mask, name )186 187 IMPLICIT NONE 188 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 189 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDom Order190 LOGICAL(KIND=C_BOOL) :: axisDom Order_tmp195 ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 196 197 IMPLICIT NONE 198 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 199 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 200 LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 191 201 LOGICAL, OPTIONAL, INTENT(OUT) :: description 192 202 LOGICAL(KIND=C_BOOL) :: description_tmp … … 199 209 200 210 CALL xios(is_defined_gridgroup_attr_hdl_) & 201 ( gridgroup_hdl, axisDom Order, description, group_ref, mask, name )211 ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 202 212 203 213 END SUBROUTINE xios(is_defined_gridgroup_attr_hdl) 204 214 205 215 SUBROUTINE xios(is_defined_gridgroup_attr_hdl_) & 206 ( gridgroup_hdl, axisDom Order_, description_, group_ref_, mask_, name_ )207 208 IMPLICIT NONE 209 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 210 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDom Order_211 LOGICAL(KIND=C_BOOL) :: axisDom Order__tmp216 ( gridgroup_hdl, axisDomainOrder_, description_, group_ref_, mask_, name_ ) 217 218 IMPLICIT NONE 219 TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 220 LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder_ 221 LOGICAL(KIND=C_BOOL) :: axisDomainOrder__tmp 212 222 LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 213 223 LOGICAL(KIND=C_BOOL) :: description__tmp … … 219 229 LOGICAL(KIND=C_BOOL) :: name__tmp 220 230 221 IF (PRESENT(axisDom Order_)) THEN222 axisDom Order__tmp=cxios_is_defined_gridgroup_axisDomOrder(gridgroup_hdl%daddr)223 axisDom Order_=axisDomOrder__tmp231 IF (PRESENT(axisDomainOrder_)) THEN 232 axisDomainOrder__tmp=cxios_is_defined_gridgroup_axisDomainOrder(gridgroup_hdl%daddr) 233 axisDomainOrder_=axisDomainOrder__tmp 224 234 ENDIF 225 235
Note: See TracChangeset
for help on using the changeset viewer.