Changeset 787
- Timestamp:
- 11/13/15 11:45:12 (8 years ago)
- Location:
- XIOS/trunk
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/inputs/COMPLETE/context_atmosphere.xml
r786 r787 20 20 <axis id="axis_atm"/> 21 21 <axis id="axis_atm_zoom" axis_ref="axis_atm"> 22 <zoom_axis id="axis_atm_zoom" zoom_size="4" zoom_end="2"/>22 <zoom_axis id="axis_atm_zoom" n="4"/> 23 23 </axis> 24 24 </axis_definition> -
XIOS/trunk/inputs/iodef.xml
r722 r787 22 22 <axis id="axis_A"/> 23 23 <axis id="axis_A_zoom" axis_ref="axis_A"> 24 <zoom_axis zoom_begin="1" zoom_size="2" />24 <zoom_axis begin="1" n="2" /> 25 25 </axis> 26 26 </axis_definition> -
XIOS/trunk/src/config/zoom_axis_attribute.conf
r626 r787 1 1 /* GLOBAL */ 2 DECLARE_ATTRIBUTE(int, zoom_begin) 3 DECLARE_ATTRIBUTE(int, zoom_end) 4 DECLARE_ATTRIBUTE(int, zoom_size) 2 DECLARE_ATTRIBUTE(int, begin) 3 DECLARE_ATTRIBUTE(int, n) -
XIOS/trunk/src/config/zoom_domain_attribute.conf
r784 r787 1 1 /* GLOBAL */ 2 DECLARE_ATTRIBUTE(int , zoom_ni)3 DECLARE_ATTRIBUTE(int , zoom_nj)4 DECLARE_ATTRIBUTE(int , zoom_ibegin)5 DECLARE_ATTRIBUTE(int , zoom_jbegin)2 DECLARE_ATTRIBUTE(int , ni) 3 DECLARE_ATTRIBUTE(int , nj) 4 DECLARE_ATTRIBUTE(int , ibegin) 5 DECLARE_ATTRIBUTE(int , jbegin) -
XIOS/trunk/src/interface/c_attr/iczoom_axis_attr.cpp
r784 r787 18 18 typedef xios::CZoomAxis* zoom_axis_Ptr; 19 19 20 void cxios_set_zoom_axis_ zoom_begin(zoom_axis_Ptr zoom_axis_hdl, int zoom_begin)20 void cxios_set_zoom_axis_begin(zoom_axis_Ptr zoom_axis_hdl, int begin) 21 21 { 22 22 CTimer::get("XIOS").resume(); 23 zoom_axis_hdl-> zoom_begin.setValue(zoom_begin);23 zoom_axis_hdl->begin.setValue(begin); 24 24 CTimer::get("XIOS").suspend(); 25 25 } 26 26 27 void cxios_get_zoom_axis_ zoom_begin(zoom_axis_Ptr zoom_axis_hdl, int* zoom_begin)27 void cxios_get_zoom_axis_begin(zoom_axis_Ptr zoom_axis_hdl, int* begin) 28 28 { 29 29 CTimer::get("XIOS").resume(); 30 * zoom_begin = zoom_axis_hdl->zoom_begin.getInheritedValue();30 *begin = zoom_axis_hdl->begin.getInheritedValue(); 31 31 CTimer::get("XIOS").suspend(); 32 32 } 33 33 34 bool cxios_is_defined_zoom_axis_ zoom_begin(zoom_axis_Ptr zoom_axis_hdl)34 bool cxios_is_defined_zoom_axis_begin(zoom_axis_Ptr zoom_axis_hdl) 35 35 { 36 36 CTimer::get("XIOS").resume(); 37 bool isDefined = zoom_axis_hdl-> zoom_begin.hasInheritedValue();37 bool isDefined = zoom_axis_hdl->begin.hasInheritedValue(); 38 38 CTimer::get("XIOS").suspend(); 39 39 return isDefined; … … 41 41 42 42 43 void cxios_set_zoom_axis_ zoom_end(zoom_axis_Ptr zoom_axis_hdl, int zoom_end)43 void cxios_set_zoom_axis_n(zoom_axis_Ptr zoom_axis_hdl, int n) 44 44 { 45 45 CTimer::get("XIOS").resume(); 46 zoom_axis_hdl-> zoom_end.setValue(zoom_end);46 zoom_axis_hdl->n.setValue(n); 47 47 CTimer::get("XIOS").suspend(); 48 48 } 49 49 50 void cxios_get_zoom_axis_ zoom_end(zoom_axis_Ptr zoom_axis_hdl, int* zoom_end)50 void cxios_get_zoom_axis_n(zoom_axis_Ptr zoom_axis_hdl, int* n) 51 51 { 52 52 CTimer::get("XIOS").resume(); 53 * zoom_end = zoom_axis_hdl->zoom_end.getInheritedValue();53 *n = zoom_axis_hdl->n.getInheritedValue(); 54 54 CTimer::get("XIOS").suspend(); 55 55 } 56 56 57 bool cxios_is_defined_zoom_axis_ zoom_end(zoom_axis_Ptr zoom_axis_hdl)57 bool cxios_is_defined_zoom_axis_n(zoom_axis_Ptr zoom_axis_hdl) 58 58 { 59 59 CTimer::get("XIOS").resume(); 60 bool isDefined = zoom_axis_hdl->zoom_end.hasInheritedValue(); 61 CTimer::get("XIOS").suspend(); 62 return isDefined; 63 } 64 65 66 void cxios_set_zoom_axis_zoom_size(zoom_axis_Ptr zoom_axis_hdl, int zoom_size) 67 { 68 CTimer::get("XIOS").resume(); 69 zoom_axis_hdl->zoom_size.setValue(zoom_size); 70 CTimer::get("XIOS").suspend(); 71 } 72 73 void cxios_get_zoom_axis_zoom_size(zoom_axis_Ptr zoom_axis_hdl, int* zoom_size) 74 { 75 CTimer::get("XIOS").resume(); 76 *zoom_size = zoom_axis_hdl->zoom_size.getInheritedValue(); 77 CTimer::get("XIOS").suspend(); 78 } 79 80 bool cxios_is_defined_zoom_axis_zoom_size(zoom_axis_Ptr zoom_axis_hdl) 81 { 82 CTimer::get("XIOS").resume(); 83 bool isDefined = zoom_axis_hdl->zoom_size.hasInheritedValue(); 60 bool isDefined = zoom_axis_hdl->n.hasInheritedValue(); 84 61 CTimer::get("XIOS").suspend(); 85 62 return isDefined; -
XIOS/trunk/src/interface/c_attr/iczoom_domain_attr.cpp
r784 r787 18 18 typedef xios::CZoomDomain* zoom_domain_Ptr; 19 19 20 void cxios_set_zoom_domain_ zoom_ibegin(zoom_domain_Ptr zoom_domain_hdl, int zoom_ibegin)20 void cxios_set_zoom_domain_ibegin(zoom_domain_Ptr zoom_domain_hdl, int ibegin) 21 21 { 22 22 CTimer::get("XIOS").resume(); 23 zoom_domain_hdl-> zoom_ibegin.setValue(zoom_ibegin);23 zoom_domain_hdl->ibegin.setValue(ibegin); 24 24 CTimer::get("XIOS").suspend(); 25 25 } 26 26 27 void cxios_get_zoom_domain_ zoom_ibegin(zoom_domain_Ptr zoom_domain_hdl, int* zoom_ibegin)27 void cxios_get_zoom_domain_ibegin(zoom_domain_Ptr zoom_domain_hdl, int* ibegin) 28 28 { 29 29 CTimer::get("XIOS").resume(); 30 * zoom_ibegin = zoom_domain_hdl->zoom_ibegin.getInheritedValue();30 *ibegin = zoom_domain_hdl->ibegin.getInheritedValue(); 31 31 CTimer::get("XIOS").suspend(); 32 32 } 33 33 34 bool cxios_is_defined_zoom_domain_ zoom_ibegin(zoom_domain_Ptr zoom_domain_hdl)34 bool cxios_is_defined_zoom_domain_ibegin(zoom_domain_Ptr zoom_domain_hdl) 35 35 { 36 36 CTimer::get("XIOS").resume(); 37 bool isDefined = zoom_domain_hdl-> zoom_ibegin.hasInheritedValue();37 bool isDefined = zoom_domain_hdl->ibegin.hasInheritedValue(); 38 38 CTimer::get("XIOS").suspend(); 39 39 return isDefined; … … 41 41 42 42 43 void cxios_set_zoom_domain_ zoom_jbegin(zoom_domain_Ptr zoom_domain_hdl, int zoom_jbegin)43 void cxios_set_zoom_domain_jbegin(zoom_domain_Ptr zoom_domain_hdl, int jbegin) 44 44 { 45 45 CTimer::get("XIOS").resume(); 46 zoom_domain_hdl-> zoom_jbegin.setValue(zoom_jbegin);46 zoom_domain_hdl->jbegin.setValue(jbegin); 47 47 CTimer::get("XIOS").suspend(); 48 48 } 49 49 50 void cxios_get_zoom_domain_ zoom_jbegin(zoom_domain_Ptr zoom_domain_hdl, int* zoom_jbegin)50 void cxios_get_zoom_domain_jbegin(zoom_domain_Ptr zoom_domain_hdl, int* jbegin) 51 51 { 52 52 CTimer::get("XIOS").resume(); 53 * zoom_jbegin = zoom_domain_hdl->zoom_jbegin.getInheritedValue();53 *jbegin = zoom_domain_hdl->jbegin.getInheritedValue(); 54 54 CTimer::get("XIOS").suspend(); 55 55 } 56 56 57 bool cxios_is_defined_zoom_domain_ zoom_jbegin(zoom_domain_Ptr zoom_domain_hdl)57 bool cxios_is_defined_zoom_domain_jbegin(zoom_domain_Ptr zoom_domain_hdl) 58 58 { 59 59 CTimer::get("XIOS").resume(); 60 bool isDefined = zoom_domain_hdl-> zoom_jbegin.hasInheritedValue();60 bool isDefined = zoom_domain_hdl->jbegin.hasInheritedValue(); 61 61 CTimer::get("XIOS").suspend(); 62 62 return isDefined; … … 64 64 65 65 66 void cxios_set_zoom_domain_ zoom_ni(zoom_domain_Ptr zoom_domain_hdl, int zoom_ni)66 void cxios_set_zoom_domain_ni(zoom_domain_Ptr zoom_domain_hdl, int ni) 67 67 { 68 68 CTimer::get("XIOS").resume(); 69 zoom_domain_hdl-> zoom_ni.setValue(zoom_ni);69 zoom_domain_hdl->ni.setValue(ni); 70 70 CTimer::get("XIOS").suspend(); 71 71 } 72 72 73 void cxios_get_zoom_domain_ zoom_ni(zoom_domain_Ptr zoom_domain_hdl, int* zoom_ni)73 void cxios_get_zoom_domain_ni(zoom_domain_Ptr zoom_domain_hdl, int* ni) 74 74 { 75 75 CTimer::get("XIOS").resume(); 76 * zoom_ni = zoom_domain_hdl->zoom_ni.getInheritedValue();76 *ni = zoom_domain_hdl->ni.getInheritedValue(); 77 77 CTimer::get("XIOS").suspend(); 78 78 } 79 79 80 bool cxios_is_defined_zoom_domain_ zoom_ni(zoom_domain_Ptr zoom_domain_hdl)80 bool cxios_is_defined_zoom_domain_ni(zoom_domain_Ptr zoom_domain_hdl) 81 81 { 82 82 CTimer::get("XIOS").resume(); 83 bool isDefined = zoom_domain_hdl-> zoom_ni.hasInheritedValue();83 bool isDefined = zoom_domain_hdl->ni.hasInheritedValue(); 84 84 CTimer::get("XIOS").suspend(); 85 85 return isDefined; … … 87 87 88 88 89 void cxios_set_zoom_domain_ zoom_nj(zoom_domain_Ptr zoom_domain_hdl, int zoom_nj)89 void cxios_set_zoom_domain_nj(zoom_domain_Ptr zoom_domain_hdl, int nj) 90 90 { 91 91 CTimer::get("XIOS").resume(); 92 zoom_domain_hdl-> zoom_nj.setValue(zoom_nj);92 zoom_domain_hdl->nj.setValue(nj); 93 93 CTimer::get("XIOS").suspend(); 94 94 } 95 95 96 void cxios_get_zoom_domain_ zoom_nj(zoom_domain_Ptr zoom_domain_hdl, int* zoom_nj)96 void cxios_get_zoom_domain_nj(zoom_domain_Ptr zoom_domain_hdl, int* nj) 97 97 { 98 98 CTimer::get("XIOS").resume(); 99 * zoom_nj = zoom_domain_hdl->zoom_nj.getInheritedValue();99 *nj = zoom_domain_hdl->nj.getInheritedValue(); 100 100 CTimer::get("XIOS").suspend(); 101 101 } 102 102 103 bool cxios_is_defined_zoom_domain_ zoom_nj(zoom_domain_Ptr zoom_domain_hdl)103 bool cxios_is_defined_zoom_domain_nj(zoom_domain_Ptr zoom_domain_hdl) 104 104 { 105 105 CTimer::get("XIOS").resume(); 106 bool isDefined = zoom_domain_hdl-> zoom_nj.hasInheritedValue();106 bool isDefined = zoom_domain_hdl->nj.hasInheritedValue(); 107 107 CTimer::get("XIOS").suspend(); 108 108 return isDefined; -
XIOS/trunk/src/interface/fortran_attr/izoom_axis_attr.F90
r784 r787 12 12 13 13 SUBROUTINE xios(set_zoom_axis_attr) & 14 ( zoom_axis_id, zoom_begin, zoom_end, zoom_size)14 ( zoom_axis_id, begin, n ) 15 15 16 16 IMPLICIT NONE 17 17 TYPE(txios(zoom_axis)) :: zoom_axis_hdl 18 18 CHARACTER(LEN=*), INTENT(IN) ::zoom_axis_id 19 INTEGER , OPTIONAL, INTENT(IN) :: zoom_begin 20 INTEGER , OPTIONAL, INTENT(IN) :: zoom_end 21 INTEGER , OPTIONAL, INTENT(IN) :: zoom_size 19 INTEGER , OPTIONAL, INTENT(IN) :: begin 20 INTEGER , OPTIONAL, INTENT(IN) :: n 22 21 23 22 CALL xios(get_zoom_axis_handle)(zoom_axis_id,zoom_axis_hdl) 24 23 CALL xios(set_zoom_axis_attr_hdl_) & 25 ( zoom_axis_hdl, zoom_begin, zoom_end, zoom_size)24 ( zoom_axis_hdl, begin, n ) 26 25 27 26 END SUBROUTINE xios(set_zoom_axis_attr) 28 27 29 28 SUBROUTINE xios(set_zoom_axis_attr_hdl) & 30 ( zoom_axis_hdl, zoom_begin, zoom_end, zoom_size)29 ( zoom_axis_hdl, begin, n ) 31 30 32 31 IMPLICIT NONE 33 32 TYPE(txios(zoom_axis)) , INTENT(IN) :: zoom_axis_hdl 34 INTEGER , OPTIONAL, INTENT(IN) :: zoom_begin 35 INTEGER , OPTIONAL, INTENT(IN) :: zoom_end 36 INTEGER , OPTIONAL, INTENT(IN) :: zoom_size 33 INTEGER , OPTIONAL, INTENT(IN) :: begin 34 INTEGER , OPTIONAL, INTENT(IN) :: n 37 35 38 36 CALL xios(set_zoom_axis_attr_hdl_) & 39 ( zoom_axis_hdl, zoom_begin, zoom_end, zoom_size)37 ( zoom_axis_hdl, begin, n ) 40 38 41 39 END SUBROUTINE xios(set_zoom_axis_attr_hdl) 42 40 43 41 SUBROUTINE xios(set_zoom_axis_attr_hdl_) & 44 ( zoom_axis_hdl, zoom_begin_, zoom_end_, zoom_size_ )42 ( zoom_axis_hdl, begin_, n_ ) 45 43 46 44 IMPLICIT NONE 47 45 TYPE(txios(zoom_axis)) , INTENT(IN) :: zoom_axis_hdl 48 INTEGER , OPTIONAL, INTENT(IN) :: zoom_begin_ 49 INTEGER , OPTIONAL, INTENT(IN) :: zoom_end_ 50 INTEGER , OPTIONAL, INTENT(IN) :: zoom_size_ 46 INTEGER , OPTIONAL, INTENT(IN) :: begin_ 47 INTEGER , OPTIONAL, INTENT(IN) :: n_ 51 48 52 IF (PRESENT( zoom_begin_)) THEN53 CALL cxios_set_zoom_axis_ zoom_begin(zoom_axis_hdl%daddr, zoom_begin_)49 IF (PRESENT(begin_)) THEN 50 CALL cxios_set_zoom_axis_begin(zoom_axis_hdl%daddr, begin_) 54 51 ENDIF 55 52 56 IF (PRESENT(zoom_end_)) THEN 57 CALL cxios_set_zoom_axis_zoom_end(zoom_axis_hdl%daddr, zoom_end_) 58 ENDIF 59 60 IF (PRESENT(zoom_size_)) THEN 61 CALL cxios_set_zoom_axis_zoom_size(zoom_axis_hdl%daddr, zoom_size_) 53 IF (PRESENT(n_)) THEN 54 CALL cxios_set_zoom_axis_n(zoom_axis_hdl%daddr, n_) 62 55 ENDIF 63 56 … … 65 58 66 59 SUBROUTINE xios(get_zoom_axis_attr) & 67 ( zoom_axis_id, zoom_begin, zoom_end, zoom_size)60 ( zoom_axis_id, begin, n ) 68 61 69 62 IMPLICIT NONE 70 63 TYPE(txios(zoom_axis)) :: zoom_axis_hdl 71 64 CHARACTER(LEN=*), INTENT(IN) ::zoom_axis_id 72 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_begin 73 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_end 74 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_size 65 INTEGER , OPTIONAL, INTENT(OUT) :: begin 66 INTEGER , OPTIONAL, INTENT(OUT) :: n 75 67 76 68 CALL xios(get_zoom_axis_handle)(zoom_axis_id,zoom_axis_hdl) 77 69 CALL xios(get_zoom_axis_attr_hdl_) & 78 ( zoom_axis_hdl, zoom_begin, zoom_end, zoom_size)70 ( zoom_axis_hdl, begin, n ) 79 71 80 72 END SUBROUTINE xios(get_zoom_axis_attr) 81 73 82 74 SUBROUTINE xios(get_zoom_axis_attr_hdl) & 83 ( zoom_axis_hdl, zoom_begin, zoom_end, zoom_size)75 ( zoom_axis_hdl, begin, n ) 84 76 85 77 IMPLICIT NONE 86 78 TYPE(txios(zoom_axis)) , INTENT(IN) :: zoom_axis_hdl 87 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_begin 88 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_end 89 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_size 79 INTEGER , OPTIONAL, INTENT(OUT) :: begin 80 INTEGER , OPTIONAL, INTENT(OUT) :: n 90 81 91 82 CALL xios(get_zoom_axis_attr_hdl_) & 92 ( zoom_axis_hdl, zoom_begin, zoom_end, zoom_size)83 ( zoom_axis_hdl, begin, n ) 93 84 94 85 END SUBROUTINE xios(get_zoom_axis_attr_hdl) 95 86 96 87 SUBROUTINE xios(get_zoom_axis_attr_hdl_) & 97 ( zoom_axis_hdl, zoom_begin_, zoom_end_, zoom_size_ )88 ( zoom_axis_hdl, begin_, n_ ) 98 89 99 90 IMPLICIT NONE 100 91 TYPE(txios(zoom_axis)) , INTENT(IN) :: zoom_axis_hdl 101 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_begin_ 102 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_end_ 103 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_size_ 92 INTEGER , OPTIONAL, INTENT(OUT) :: begin_ 93 INTEGER , OPTIONAL, INTENT(OUT) :: n_ 104 94 105 IF (PRESENT( zoom_begin_)) THEN106 CALL cxios_get_zoom_axis_ zoom_begin(zoom_axis_hdl%daddr, zoom_begin_)95 IF (PRESENT(begin_)) THEN 96 CALL cxios_get_zoom_axis_begin(zoom_axis_hdl%daddr, begin_) 107 97 ENDIF 108 98 109 IF (PRESENT(zoom_end_)) THEN 110 CALL cxios_get_zoom_axis_zoom_end(zoom_axis_hdl%daddr, zoom_end_) 111 ENDIF 112 113 IF (PRESENT(zoom_size_)) THEN 114 CALL cxios_get_zoom_axis_zoom_size(zoom_axis_hdl%daddr, zoom_size_) 99 IF (PRESENT(n_)) THEN 100 CALL cxios_get_zoom_axis_n(zoom_axis_hdl%daddr, n_) 115 101 ENDIF 116 102 … … 118 104 119 105 SUBROUTINE xios(is_defined_zoom_axis_attr) & 120 ( zoom_axis_id, zoom_begin, zoom_end, zoom_size)106 ( zoom_axis_id, begin, n ) 121 107 122 108 IMPLICIT NONE 123 109 TYPE(txios(zoom_axis)) :: zoom_axis_hdl 124 110 CHARACTER(LEN=*), INTENT(IN) ::zoom_axis_id 125 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_begin 126 LOGICAL(KIND=C_BOOL) :: zoom_begin_tmp 127 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_end 128 LOGICAL(KIND=C_BOOL) :: zoom_end_tmp 129 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_size 130 LOGICAL(KIND=C_BOOL) :: zoom_size_tmp 111 LOGICAL, OPTIONAL, INTENT(OUT) :: begin 112 LOGICAL(KIND=C_BOOL) :: begin_tmp 113 LOGICAL, OPTIONAL, INTENT(OUT) :: n 114 LOGICAL(KIND=C_BOOL) :: n_tmp 131 115 132 116 CALL xios(get_zoom_axis_handle)(zoom_axis_id,zoom_axis_hdl) 133 117 CALL xios(is_defined_zoom_axis_attr_hdl_) & 134 ( zoom_axis_hdl, zoom_begin, zoom_end, zoom_size)118 ( zoom_axis_hdl, begin, n ) 135 119 136 120 END SUBROUTINE xios(is_defined_zoom_axis_attr) 137 121 138 122 SUBROUTINE xios(is_defined_zoom_axis_attr_hdl) & 139 ( zoom_axis_hdl, zoom_begin, zoom_end, zoom_size)123 ( zoom_axis_hdl, begin, n ) 140 124 141 125 IMPLICIT NONE 142 126 TYPE(txios(zoom_axis)) , INTENT(IN) :: zoom_axis_hdl 143 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_begin 144 LOGICAL(KIND=C_BOOL) :: zoom_begin_tmp 145 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_end 146 LOGICAL(KIND=C_BOOL) :: zoom_end_tmp 147 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_size 148 LOGICAL(KIND=C_BOOL) :: zoom_size_tmp 127 LOGICAL, OPTIONAL, INTENT(OUT) :: begin 128 LOGICAL(KIND=C_BOOL) :: begin_tmp 129 LOGICAL, OPTIONAL, INTENT(OUT) :: n 130 LOGICAL(KIND=C_BOOL) :: n_tmp 149 131 150 132 CALL xios(is_defined_zoom_axis_attr_hdl_) & 151 ( zoom_axis_hdl, zoom_begin, zoom_end, zoom_size)133 ( zoom_axis_hdl, begin, n ) 152 134 153 135 END SUBROUTINE xios(is_defined_zoom_axis_attr_hdl) 154 136 155 137 SUBROUTINE xios(is_defined_zoom_axis_attr_hdl_) & 156 ( zoom_axis_hdl, zoom_begin_, zoom_end_, zoom_size_ )138 ( zoom_axis_hdl, begin_, n_ ) 157 139 158 140 IMPLICIT NONE 159 141 TYPE(txios(zoom_axis)) , INTENT(IN) :: zoom_axis_hdl 160 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_begin_ 161 LOGICAL(KIND=C_BOOL) :: zoom_begin__tmp 162 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_end_ 163 LOGICAL(KIND=C_BOOL) :: zoom_end__tmp 164 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_size_ 165 LOGICAL(KIND=C_BOOL) :: zoom_size__tmp 142 LOGICAL, OPTIONAL, INTENT(OUT) :: begin_ 143 LOGICAL(KIND=C_BOOL) :: begin__tmp 144 LOGICAL, OPTIONAL, INTENT(OUT) :: n_ 145 LOGICAL(KIND=C_BOOL) :: n__tmp 166 146 167 IF (PRESENT( zoom_begin_)) THEN168 zoom_begin__tmp = cxios_is_defined_zoom_axis_zoom_begin(zoom_axis_hdl%daddr)169 zoom_begin_ = zoom_begin__tmp147 IF (PRESENT(begin_)) THEN 148 begin__tmp = cxios_is_defined_zoom_axis_begin(zoom_axis_hdl%daddr) 149 begin_ = begin__tmp 170 150 ENDIF 171 151 172 IF (PRESENT(zoom_end_)) THEN 173 zoom_end__tmp = cxios_is_defined_zoom_axis_zoom_end(zoom_axis_hdl%daddr) 174 zoom_end_ = zoom_end__tmp 175 ENDIF 176 177 IF (PRESENT(zoom_size_)) THEN 178 zoom_size__tmp = cxios_is_defined_zoom_axis_zoom_size(zoom_axis_hdl%daddr) 179 zoom_size_ = zoom_size__tmp 152 IF (PRESENT(n_)) THEN 153 n__tmp = cxios_is_defined_zoom_axis_n(zoom_axis_hdl%daddr) 154 n_ = n__tmp 180 155 ENDIF 181 156 -
XIOS/trunk/src/interface/fortran_attr/izoom_domain_attr.F90
r784 r787 12 12 13 13 SUBROUTINE xios(set_zoom_domain_attr) & 14 ( zoom_domain_id, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )14 ( zoom_domain_id, ibegin, jbegin, ni, nj ) 15 15 16 16 IMPLICIT NONE 17 17 TYPE(txios(zoom_domain)) :: zoom_domain_hdl 18 18 CHARACTER(LEN=*), INTENT(IN) ::zoom_domain_id 19 INTEGER , OPTIONAL, INTENT(IN) :: zoom_ibegin20 INTEGER , OPTIONAL, INTENT(IN) :: zoom_jbegin21 INTEGER , OPTIONAL, INTENT(IN) :: zoom_ni22 INTEGER , OPTIONAL, INTENT(IN) :: zoom_nj19 INTEGER , OPTIONAL, INTENT(IN) :: ibegin 20 INTEGER , OPTIONAL, INTENT(IN) :: jbegin 21 INTEGER , OPTIONAL, INTENT(IN) :: ni 22 INTEGER , OPTIONAL, INTENT(IN) :: nj 23 23 24 24 CALL xios(get_zoom_domain_handle)(zoom_domain_id,zoom_domain_hdl) 25 25 CALL xios(set_zoom_domain_attr_hdl_) & 26 ( zoom_domain_hdl, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )26 ( zoom_domain_hdl, ibegin, jbegin, ni, nj ) 27 27 28 28 END SUBROUTINE xios(set_zoom_domain_attr) 29 29 30 30 SUBROUTINE xios(set_zoom_domain_attr_hdl) & 31 ( zoom_domain_hdl, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )32 33 IMPLICIT NONE 34 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 35 INTEGER , OPTIONAL, INTENT(IN) :: zoom_ibegin36 INTEGER , OPTIONAL, INTENT(IN) :: zoom_jbegin37 INTEGER , OPTIONAL, INTENT(IN) :: zoom_ni38 INTEGER , OPTIONAL, INTENT(IN) :: zoom_nj31 ( zoom_domain_hdl, ibegin, jbegin, ni, nj ) 32 33 IMPLICIT NONE 34 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 35 INTEGER , OPTIONAL, INTENT(IN) :: ibegin 36 INTEGER , OPTIONAL, INTENT(IN) :: jbegin 37 INTEGER , OPTIONAL, INTENT(IN) :: ni 38 INTEGER , OPTIONAL, INTENT(IN) :: nj 39 39 40 40 CALL xios(set_zoom_domain_attr_hdl_) & 41 ( zoom_domain_hdl, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )41 ( zoom_domain_hdl, ibegin, jbegin, ni, nj ) 42 42 43 43 END SUBROUTINE xios(set_zoom_domain_attr_hdl) 44 44 45 45 SUBROUTINE xios(set_zoom_domain_attr_hdl_) & 46 ( zoom_domain_hdl, zoom_ibegin_, zoom_jbegin_, zoom_ni_, zoom_nj_ )47 48 IMPLICIT NONE 49 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 50 INTEGER , OPTIONAL, INTENT(IN) :: zoom_ibegin_51 INTEGER , OPTIONAL, INTENT(IN) :: zoom_jbegin_52 INTEGER , OPTIONAL, INTENT(IN) :: zoom_ni_53 INTEGER , OPTIONAL, INTENT(IN) :: zoom_nj_54 55 IF (PRESENT( zoom_ibegin_)) THEN56 CALL cxios_set_zoom_domain_ zoom_ibegin(zoom_domain_hdl%daddr, zoom_ibegin_)57 ENDIF 58 59 IF (PRESENT( zoom_jbegin_)) THEN60 CALL cxios_set_zoom_domain_ zoom_jbegin(zoom_domain_hdl%daddr, zoom_jbegin_)61 ENDIF 62 63 IF (PRESENT( zoom_ni_)) THEN64 CALL cxios_set_zoom_domain_ zoom_ni(zoom_domain_hdl%daddr, zoom_ni_)65 ENDIF 66 67 IF (PRESENT( zoom_nj_)) THEN68 CALL cxios_set_zoom_domain_ zoom_nj(zoom_domain_hdl%daddr, zoom_nj_)46 ( zoom_domain_hdl, ibegin_, jbegin_, ni_, nj_ ) 47 48 IMPLICIT NONE 49 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 50 INTEGER , OPTIONAL, INTENT(IN) :: ibegin_ 51 INTEGER , OPTIONAL, INTENT(IN) :: jbegin_ 52 INTEGER , OPTIONAL, INTENT(IN) :: ni_ 53 INTEGER , OPTIONAL, INTENT(IN) :: nj_ 54 55 IF (PRESENT(ibegin_)) THEN 56 CALL cxios_set_zoom_domain_ibegin(zoom_domain_hdl%daddr, ibegin_) 57 ENDIF 58 59 IF (PRESENT(jbegin_)) THEN 60 CALL cxios_set_zoom_domain_jbegin(zoom_domain_hdl%daddr, jbegin_) 61 ENDIF 62 63 IF (PRESENT(ni_)) THEN 64 CALL cxios_set_zoom_domain_ni(zoom_domain_hdl%daddr, ni_) 65 ENDIF 66 67 IF (PRESENT(nj_)) THEN 68 CALL cxios_set_zoom_domain_nj(zoom_domain_hdl%daddr, nj_) 69 69 ENDIF 70 70 … … 72 72 73 73 SUBROUTINE xios(get_zoom_domain_attr) & 74 ( zoom_domain_id, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )74 ( zoom_domain_id, ibegin, jbegin, ni, nj ) 75 75 76 76 IMPLICIT NONE 77 77 TYPE(txios(zoom_domain)) :: zoom_domain_hdl 78 78 CHARACTER(LEN=*), INTENT(IN) ::zoom_domain_id 79 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_ibegin80 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_jbegin81 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_ni82 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_nj79 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin 80 INTEGER , OPTIONAL, INTENT(OUT) :: jbegin 81 INTEGER , OPTIONAL, INTENT(OUT) :: ni 82 INTEGER , OPTIONAL, INTENT(OUT) :: nj 83 83 84 84 CALL xios(get_zoom_domain_handle)(zoom_domain_id,zoom_domain_hdl) 85 85 CALL xios(get_zoom_domain_attr_hdl_) & 86 ( zoom_domain_hdl, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )86 ( zoom_domain_hdl, ibegin, jbegin, ni, nj ) 87 87 88 88 END SUBROUTINE xios(get_zoom_domain_attr) 89 89 90 90 SUBROUTINE xios(get_zoom_domain_attr_hdl) & 91 ( zoom_domain_hdl, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )92 93 IMPLICIT NONE 94 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 95 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_ibegin96 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_jbegin97 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_ni98 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_nj91 ( zoom_domain_hdl, ibegin, jbegin, ni, nj ) 92 93 IMPLICIT NONE 94 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 95 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin 96 INTEGER , OPTIONAL, INTENT(OUT) :: jbegin 97 INTEGER , OPTIONAL, INTENT(OUT) :: ni 98 INTEGER , OPTIONAL, INTENT(OUT) :: nj 99 99 100 100 CALL xios(get_zoom_domain_attr_hdl_) & 101 ( zoom_domain_hdl, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )101 ( zoom_domain_hdl, ibegin, jbegin, ni, nj ) 102 102 103 103 END SUBROUTINE xios(get_zoom_domain_attr_hdl) 104 104 105 105 SUBROUTINE xios(get_zoom_domain_attr_hdl_) & 106 ( zoom_domain_hdl, zoom_ibegin_, zoom_jbegin_, zoom_ni_, zoom_nj_ )107 108 IMPLICIT NONE 109 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 110 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_ibegin_111 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_jbegin_112 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_ni_113 INTEGER , OPTIONAL, INTENT(OUT) :: zoom_nj_114 115 IF (PRESENT( zoom_ibegin_)) THEN116 CALL cxios_get_zoom_domain_ zoom_ibegin(zoom_domain_hdl%daddr, zoom_ibegin_)117 ENDIF 118 119 IF (PRESENT( zoom_jbegin_)) THEN120 CALL cxios_get_zoom_domain_ zoom_jbegin(zoom_domain_hdl%daddr, zoom_jbegin_)121 ENDIF 122 123 IF (PRESENT( zoom_ni_)) THEN124 CALL cxios_get_zoom_domain_ zoom_ni(zoom_domain_hdl%daddr, zoom_ni_)125 ENDIF 126 127 IF (PRESENT( zoom_nj_)) THEN128 CALL cxios_get_zoom_domain_ zoom_nj(zoom_domain_hdl%daddr, zoom_nj_)106 ( zoom_domain_hdl, ibegin_, jbegin_, ni_, nj_ ) 107 108 IMPLICIT NONE 109 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 110 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin_ 111 INTEGER , OPTIONAL, INTENT(OUT) :: jbegin_ 112 INTEGER , OPTIONAL, INTENT(OUT) :: ni_ 113 INTEGER , OPTIONAL, INTENT(OUT) :: nj_ 114 115 IF (PRESENT(ibegin_)) THEN 116 CALL cxios_get_zoom_domain_ibegin(zoom_domain_hdl%daddr, ibegin_) 117 ENDIF 118 119 IF (PRESENT(jbegin_)) THEN 120 CALL cxios_get_zoom_domain_jbegin(zoom_domain_hdl%daddr, jbegin_) 121 ENDIF 122 123 IF (PRESENT(ni_)) THEN 124 CALL cxios_get_zoom_domain_ni(zoom_domain_hdl%daddr, ni_) 125 ENDIF 126 127 IF (PRESENT(nj_)) THEN 128 CALL cxios_get_zoom_domain_nj(zoom_domain_hdl%daddr, nj_) 129 129 ENDIF 130 130 … … 132 132 133 133 SUBROUTINE xios(is_defined_zoom_domain_attr) & 134 ( zoom_domain_id, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )134 ( zoom_domain_id, ibegin, jbegin, ni, nj ) 135 135 136 136 IMPLICIT NONE 137 137 TYPE(txios(zoom_domain)) :: zoom_domain_hdl 138 138 CHARACTER(LEN=*), INTENT(IN) ::zoom_domain_id 139 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_ibegin140 LOGICAL(KIND=C_BOOL) :: zoom_ibegin_tmp141 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_jbegin142 LOGICAL(KIND=C_BOOL) :: zoom_jbegin_tmp143 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_ni144 LOGICAL(KIND=C_BOOL) :: zoom_ni_tmp145 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_nj146 LOGICAL(KIND=C_BOOL) :: zoom_nj_tmp139 LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin 140 LOGICAL(KIND=C_BOOL) :: ibegin_tmp 141 LOGICAL, OPTIONAL, INTENT(OUT) :: jbegin 142 LOGICAL(KIND=C_BOOL) :: jbegin_tmp 143 LOGICAL, OPTIONAL, INTENT(OUT) :: ni 144 LOGICAL(KIND=C_BOOL) :: ni_tmp 145 LOGICAL, OPTIONAL, INTENT(OUT) :: nj 146 LOGICAL(KIND=C_BOOL) :: nj_tmp 147 147 148 148 CALL xios(get_zoom_domain_handle)(zoom_domain_id,zoom_domain_hdl) 149 149 CALL xios(is_defined_zoom_domain_attr_hdl_) & 150 ( zoom_domain_hdl, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )150 ( zoom_domain_hdl, ibegin, jbegin, ni, nj ) 151 151 152 152 END SUBROUTINE xios(is_defined_zoom_domain_attr) 153 153 154 154 SUBROUTINE xios(is_defined_zoom_domain_attr_hdl) & 155 ( zoom_domain_hdl, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )156 157 IMPLICIT NONE 158 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 159 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_ibegin160 LOGICAL(KIND=C_BOOL) :: zoom_ibegin_tmp161 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_jbegin162 LOGICAL(KIND=C_BOOL) :: zoom_jbegin_tmp163 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_ni164 LOGICAL(KIND=C_BOOL) :: zoom_ni_tmp165 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_nj166 LOGICAL(KIND=C_BOOL) :: zoom_nj_tmp155 ( zoom_domain_hdl, ibegin, jbegin, ni, nj ) 156 157 IMPLICIT NONE 158 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 159 LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin 160 LOGICAL(KIND=C_BOOL) :: ibegin_tmp 161 LOGICAL, OPTIONAL, INTENT(OUT) :: jbegin 162 LOGICAL(KIND=C_BOOL) :: jbegin_tmp 163 LOGICAL, OPTIONAL, INTENT(OUT) :: ni 164 LOGICAL(KIND=C_BOOL) :: ni_tmp 165 LOGICAL, OPTIONAL, INTENT(OUT) :: nj 166 LOGICAL(KIND=C_BOOL) :: nj_tmp 167 167 168 168 CALL xios(is_defined_zoom_domain_attr_hdl_) & 169 ( zoom_domain_hdl, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj )169 ( zoom_domain_hdl, ibegin, jbegin, ni, nj ) 170 170 171 171 END SUBROUTINE xios(is_defined_zoom_domain_attr_hdl) 172 172 173 173 SUBROUTINE xios(is_defined_zoom_domain_attr_hdl_) & 174 ( zoom_domain_hdl, zoom_ibegin_, zoom_jbegin_, zoom_ni_, zoom_nj_ )175 176 IMPLICIT NONE 177 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 178 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_ibegin_179 LOGICAL(KIND=C_BOOL) :: zoom_ibegin__tmp180 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_jbegin_181 LOGICAL(KIND=C_BOOL) :: zoom_jbegin__tmp182 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_ni_183 LOGICAL(KIND=C_BOOL) :: zoom_ni__tmp184 LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_nj_185 LOGICAL(KIND=C_BOOL) :: zoom_nj__tmp186 187 IF (PRESENT( zoom_ibegin_)) THEN188 zoom_ibegin__tmp = cxios_is_defined_zoom_domain_zoom_ibegin(zoom_domain_hdl%daddr)189 zoom_ibegin_ = zoom_ibegin__tmp190 ENDIF 191 192 IF (PRESENT( zoom_jbegin_)) THEN193 zoom_jbegin__tmp = cxios_is_defined_zoom_domain_zoom_jbegin(zoom_domain_hdl%daddr)194 zoom_jbegin_ = zoom_jbegin__tmp195 ENDIF 196 197 IF (PRESENT( zoom_ni_)) THEN198 zoom_ni__tmp = cxios_is_defined_zoom_domain_zoom_ni(zoom_domain_hdl%daddr)199 zoom_ni_ = zoom_ni__tmp200 ENDIF 201 202 IF (PRESENT( zoom_nj_)) THEN203 zoom_nj__tmp = cxios_is_defined_zoom_domain_zoom_nj(zoom_domain_hdl%daddr)204 zoom_nj_ = zoom_nj__tmp174 ( zoom_domain_hdl, ibegin_, jbegin_, ni_, nj_ ) 175 176 IMPLICIT NONE 177 TYPE(txios(zoom_domain)) , INTENT(IN) :: zoom_domain_hdl 178 LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin_ 179 LOGICAL(KIND=C_BOOL) :: ibegin__tmp 180 LOGICAL, OPTIONAL, INTENT(OUT) :: jbegin_ 181 LOGICAL(KIND=C_BOOL) :: jbegin__tmp 182 LOGICAL, OPTIONAL, INTENT(OUT) :: ni_ 183 LOGICAL(KIND=C_BOOL) :: ni__tmp 184 LOGICAL, OPTIONAL, INTENT(OUT) :: nj_ 185 LOGICAL(KIND=C_BOOL) :: nj__tmp 186 187 IF (PRESENT(ibegin_)) THEN 188 ibegin__tmp = cxios_is_defined_zoom_domain_ibegin(zoom_domain_hdl%daddr) 189 ibegin_ = ibegin__tmp 190 ENDIF 191 192 IF (PRESENT(jbegin_)) THEN 193 jbegin__tmp = cxios_is_defined_zoom_domain_jbegin(zoom_domain_hdl%daddr) 194 jbegin_ = jbegin__tmp 195 ENDIF 196 197 IF (PRESENT(ni_)) THEN 198 ni__tmp = cxios_is_defined_zoom_domain_ni(zoom_domain_hdl%daddr) 199 ni_ = ni__tmp 200 ENDIF 201 202 IF (PRESENT(nj_)) THEN 203 nj__tmp = cxios_is_defined_zoom_domain_nj(zoom_domain_hdl%daddr) 204 nj_ = nj__tmp 205 205 ENDIF 206 206 -
XIOS/trunk/src/interface/fortran_attr/zoom_axis_interface_attr.F90
r784 r787 10 10 ! Do not call directly / interface FORTRAN 2003 <-> C99 11 11 12 SUBROUTINE cxios_set_zoom_axis_ zoom_begin(zoom_axis_hdl, zoom_begin) BIND(C)12 SUBROUTINE cxios_set_zoom_axis_begin(zoom_axis_hdl, begin) BIND(C) 13 13 USE ISO_C_BINDING 14 14 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_axis_hdl 15 INTEGER (KIND=C_INT) , VALUE :: zoom_begin16 END SUBROUTINE cxios_set_zoom_axis_ zoom_begin15 INTEGER (KIND=C_INT) , VALUE :: begin 16 END SUBROUTINE cxios_set_zoom_axis_begin 17 17 18 SUBROUTINE cxios_get_zoom_axis_ zoom_begin(zoom_axis_hdl, zoom_begin) BIND(C)18 SUBROUTINE cxios_get_zoom_axis_begin(zoom_axis_hdl, begin) BIND(C) 19 19 USE ISO_C_BINDING 20 20 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_axis_hdl 21 INTEGER (KIND=C_INT) :: zoom_begin22 END SUBROUTINE cxios_get_zoom_axis_ zoom_begin21 INTEGER (KIND=C_INT) :: begin 22 END SUBROUTINE cxios_get_zoom_axis_begin 23 23 24 FUNCTION cxios_is_defined_zoom_axis_ zoom_begin(zoom_axis_hdl) BIND(C)24 FUNCTION cxios_is_defined_zoom_axis_begin(zoom_axis_hdl) BIND(C) 25 25 USE ISO_C_BINDING 26 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_axis_ zoom_begin26 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_axis_begin 27 27 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_axis_hdl 28 END FUNCTION cxios_is_defined_zoom_axis_ zoom_begin28 END FUNCTION cxios_is_defined_zoom_axis_begin 29 29 30 30 31 SUBROUTINE cxios_set_zoom_axis_ zoom_end(zoom_axis_hdl, zoom_end) BIND(C)31 SUBROUTINE cxios_set_zoom_axis_n(zoom_axis_hdl, n) BIND(C) 32 32 USE ISO_C_BINDING 33 33 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_axis_hdl 34 INTEGER (KIND=C_INT) , VALUE :: zoom_end35 END SUBROUTINE cxios_set_zoom_axis_ zoom_end34 INTEGER (KIND=C_INT) , VALUE :: n 35 END SUBROUTINE cxios_set_zoom_axis_n 36 36 37 SUBROUTINE cxios_get_zoom_axis_ zoom_end(zoom_axis_hdl, zoom_end) BIND(C)37 SUBROUTINE cxios_get_zoom_axis_n(zoom_axis_hdl, n) BIND(C) 38 38 USE ISO_C_BINDING 39 39 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_axis_hdl 40 INTEGER (KIND=C_INT) :: zoom_end41 END SUBROUTINE cxios_get_zoom_axis_ zoom_end40 INTEGER (KIND=C_INT) :: n 41 END SUBROUTINE cxios_get_zoom_axis_n 42 42 43 FUNCTION cxios_is_defined_zoom_axis_ zoom_end(zoom_axis_hdl) BIND(C)43 FUNCTION cxios_is_defined_zoom_axis_n(zoom_axis_hdl) BIND(C) 44 44 USE ISO_C_BINDING 45 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_axis_ zoom_end45 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_axis_n 46 46 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_axis_hdl 47 END FUNCTION cxios_is_defined_zoom_axis_zoom_end 48 49 50 SUBROUTINE cxios_set_zoom_axis_zoom_size(zoom_axis_hdl, zoom_size) BIND(C) 51 USE ISO_C_BINDING 52 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_axis_hdl 53 INTEGER (KIND=C_INT) , VALUE :: zoom_size 54 END SUBROUTINE cxios_set_zoom_axis_zoom_size 55 56 SUBROUTINE cxios_get_zoom_axis_zoom_size(zoom_axis_hdl, zoom_size) BIND(C) 57 USE ISO_C_BINDING 58 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_axis_hdl 59 INTEGER (KIND=C_INT) :: zoom_size 60 END SUBROUTINE cxios_get_zoom_axis_zoom_size 61 62 FUNCTION cxios_is_defined_zoom_axis_zoom_size(zoom_axis_hdl) BIND(C) 63 USE ISO_C_BINDING 64 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_axis_zoom_size 65 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_axis_hdl 66 END FUNCTION cxios_is_defined_zoom_axis_zoom_size 47 END FUNCTION cxios_is_defined_zoom_axis_n 67 48 68 49 END INTERFACE -
XIOS/trunk/src/interface/fortran_attr/zoom_domain_interface_attr.F90
r784 r787 10 10 ! Do not call directly / interface FORTRAN 2003 <-> C99 11 11 12 SUBROUTINE cxios_set_zoom_domain_ zoom_ibegin(zoom_domain_hdl, zoom_ibegin) BIND(C)12 SUBROUTINE cxios_set_zoom_domain_ibegin(zoom_domain_hdl, ibegin) BIND(C) 13 13 USE ISO_C_BINDING 14 14 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 15 INTEGER (KIND=C_INT) , VALUE :: zoom_ibegin16 END SUBROUTINE cxios_set_zoom_domain_ zoom_ibegin15 INTEGER (KIND=C_INT) , VALUE :: ibegin 16 END SUBROUTINE cxios_set_zoom_domain_ibegin 17 17 18 SUBROUTINE cxios_get_zoom_domain_ zoom_ibegin(zoom_domain_hdl, zoom_ibegin) BIND(C)18 SUBROUTINE cxios_get_zoom_domain_ibegin(zoom_domain_hdl, ibegin) BIND(C) 19 19 USE ISO_C_BINDING 20 20 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 21 INTEGER (KIND=C_INT) :: zoom_ibegin22 END SUBROUTINE cxios_get_zoom_domain_ zoom_ibegin21 INTEGER (KIND=C_INT) :: ibegin 22 END SUBROUTINE cxios_get_zoom_domain_ibegin 23 23 24 FUNCTION cxios_is_defined_zoom_domain_ zoom_ibegin(zoom_domain_hdl) BIND(C)24 FUNCTION cxios_is_defined_zoom_domain_ibegin(zoom_domain_hdl) BIND(C) 25 25 USE ISO_C_BINDING 26 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_domain_ zoom_ibegin26 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_domain_ibegin 27 27 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 28 END FUNCTION cxios_is_defined_zoom_domain_ zoom_ibegin28 END FUNCTION cxios_is_defined_zoom_domain_ibegin 29 29 30 30 31 SUBROUTINE cxios_set_zoom_domain_ zoom_jbegin(zoom_domain_hdl, zoom_jbegin) BIND(C)31 SUBROUTINE cxios_set_zoom_domain_jbegin(zoom_domain_hdl, jbegin) BIND(C) 32 32 USE ISO_C_BINDING 33 33 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 34 INTEGER (KIND=C_INT) , VALUE :: zoom_jbegin35 END SUBROUTINE cxios_set_zoom_domain_ zoom_jbegin34 INTEGER (KIND=C_INT) , VALUE :: jbegin 35 END SUBROUTINE cxios_set_zoom_domain_jbegin 36 36 37 SUBROUTINE cxios_get_zoom_domain_ zoom_jbegin(zoom_domain_hdl, zoom_jbegin) BIND(C)37 SUBROUTINE cxios_get_zoom_domain_jbegin(zoom_domain_hdl, jbegin) BIND(C) 38 38 USE ISO_C_BINDING 39 39 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 40 INTEGER (KIND=C_INT) :: zoom_jbegin41 END SUBROUTINE cxios_get_zoom_domain_ zoom_jbegin40 INTEGER (KIND=C_INT) :: jbegin 41 END SUBROUTINE cxios_get_zoom_domain_jbegin 42 42 43 FUNCTION cxios_is_defined_zoom_domain_ zoom_jbegin(zoom_domain_hdl) BIND(C)43 FUNCTION cxios_is_defined_zoom_domain_jbegin(zoom_domain_hdl) BIND(C) 44 44 USE ISO_C_BINDING 45 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_domain_ zoom_jbegin45 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_domain_jbegin 46 46 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 47 END FUNCTION cxios_is_defined_zoom_domain_ zoom_jbegin47 END FUNCTION cxios_is_defined_zoom_domain_jbegin 48 48 49 49 50 SUBROUTINE cxios_set_zoom_domain_ zoom_ni(zoom_domain_hdl, zoom_ni) BIND(C)50 SUBROUTINE cxios_set_zoom_domain_ni(zoom_domain_hdl, ni) BIND(C) 51 51 USE ISO_C_BINDING 52 52 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 53 INTEGER (KIND=C_INT) , VALUE :: zoom_ni54 END SUBROUTINE cxios_set_zoom_domain_ zoom_ni53 INTEGER (KIND=C_INT) , VALUE :: ni 54 END SUBROUTINE cxios_set_zoom_domain_ni 55 55 56 SUBROUTINE cxios_get_zoom_domain_ zoom_ni(zoom_domain_hdl, zoom_ni) BIND(C)56 SUBROUTINE cxios_get_zoom_domain_ni(zoom_domain_hdl, ni) BIND(C) 57 57 USE ISO_C_BINDING 58 58 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 59 INTEGER (KIND=C_INT) :: zoom_ni60 END SUBROUTINE cxios_get_zoom_domain_ zoom_ni59 INTEGER (KIND=C_INT) :: ni 60 END SUBROUTINE cxios_get_zoom_domain_ni 61 61 62 FUNCTION cxios_is_defined_zoom_domain_ zoom_ni(zoom_domain_hdl) BIND(C)62 FUNCTION cxios_is_defined_zoom_domain_ni(zoom_domain_hdl) BIND(C) 63 63 USE ISO_C_BINDING 64 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_domain_ zoom_ni64 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_domain_ni 65 65 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 66 END FUNCTION cxios_is_defined_zoom_domain_ zoom_ni66 END FUNCTION cxios_is_defined_zoom_domain_ni 67 67 68 68 69 SUBROUTINE cxios_set_zoom_domain_ zoom_nj(zoom_domain_hdl, zoom_nj) BIND(C)69 SUBROUTINE cxios_set_zoom_domain_nj(zoom_domain_hdl, nj) BIND(C) 70 70 USE ISO_C_BINDING 71 71 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 72 INTEGER (KIND=C_INT) , VALUE :: zoom_nj73 END SUBROUTINE cxios_set_zoom_domain_ zoom_nj72 INTEGER (KIND=C_INT) , VALUE :: nj 73 END SUBROUTINE cxios_set_zoom_domain_nj 74 74 75 SUBROUTINE cxios_get_zoom_domain_ zoom_nj(zoom_domain_hdl, zoom_nj) BIND(C)75 SUBROUTINE cxios_get_zoom_domain_nj(zoom_domain_hdl, nj) BIND(C) 76 76 USE ISO_C_BINDING 77 77 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 78 INTEGER (KIND=C_INT) :: zoom_nj79 END SUBROUTINE cxios_get_zoom_domain_ zoom_nj78 INTEGER (KIND=C_INT) :: nj 79 END SUBROUTINE cxios_get_zoom_domain_nj 80 80 81 FUNCTION cxios_is_defined_zoom_domain_ zoom_nj(zoom_domain_hdl) BIND(C)81 FUNCTION cxios_is_defined_zoom_domain_nj(zoom_domain_hdl) BIND(C) 82 82 USE ISO_C_BINDING 83 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_domain_ zoom_nj83 LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_domain_nj 84 84 INTEGER (kind = C_INTPTR_T), VALUE :: zoom_domain_hdl 85 END FUNCTION cxios_is_defined_zoom_domain_ zoom_nj85 END FUNCTION cxios_is_defined_zoom_domain_nj 86 86 87 87 END INTERFACE -
XIOS/trunk/src/node/zoom_axis.cpp
r681 r787 26 26 { 27 27 int axisIBegin, axisNi, axisGlobalSize; 28 int zoom_begin, zoom_end, zoom_size;28 int begin, end, n; 29 29 30 30 axisIBegin = axisDest->begin.getValue(); … … 32 32 axisGlobalSize = axisDest->n_glo.getValue(); 33 33 34 zoom_begin = (this->zoom_begin.isEmpty()) ? 0 : this->zoom_begin.getValue();35 zoom_size = (this->zoom_size.isEmpty()) ? axisGlobalSize : this->zoom_size.getValue();36 zoom_end = (this->zoom_end.isEmpty()) ? (axisGlobalSize - 1) : this->zoom_end.getValue();34 begin = (this->begin.isEmpty()) ? 0 : this->begin.getValue(); 35 n = (this->n.isEmpty()) ? axisGlobalSize : this->n.getValue(); 36 end = begin+n-1; 37 37 38 if (this->zoom_begin.isEmpty()) zoom_begin=zoom_end-zoom_size+1; 39 if (this->zoom_size.isEmpty()) zoom_size=zoom_end-zoom_begin+1; 40 if (this->zoom_end.isEmpty()) zoom_end=zoom_begin+zoom_size-1; 41 42 if (zoom_begin < 0 || zoom_begin > axisGlobalSize - 1 || zoom_end < 0 || zoom_end > axisGlobalSize - 1 43 || zoom_size < 1 || zoom_size > axisGlobalSize || zoom_begin > zoom_end) 38 if (begin < 0 || begin > axisGlobalSize - 1 || end < 0 || end > axisGlobalSize - 1 39 || n < 1 || n > axisGlobalSize || begin > end) 44 40 ERROR("CZoomAxis::checkValid(CAxis* axisDest)", 45 << "One or more attributes among ' zoom_begin' (" << zoom_begin << "), 'zoom_end' (" << zoom_end << "), 'zoom_size' (" << zoom_size<< ") "41 << "One or more attributes among 'begin' (" << begin << "), 'end' (" << end << "), 'n' (" << n << ") " 46 42 << "of axis transformation [ id = '" << axisDest->getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] are not well specified"); 47 43 48 this->zoom_begin.setValue(zoom_begin) ; 49 this->zoom_end.setValue(zoom_end) ; 50 this->zoom_size.setValue(zoom_size) ; 44 this->begin.setValue(begin); 45 this->n.setValue(n); 51 46 52 47 } -
XIOS/trunk/src/node/zoom_domain.cpp
r680 r787 29 29 30 30 // Résolution et vérification des données globales de zoom. 31 if (!this-> zoom_ni.isEmpty() || !this->zoom_nj.isEmpty() ||32 !this-> zoom_ibegin.isEmpty() || !this->zoom_jbegin.isEmpty())31 if (!this->ni.isEmpty() || !this->nj.isEmpty() || 32 !this->ibegin.isEmpty() || !this->jbegin.isEmpty()) 33 33 { 34 if (this-> zoom_ni.isEmpty() || this->zoom_nj.isEmpty() ||35 this-> zoom_ibegin.isEmpty() || this->zoom_jbegin.isEmpty())34 if (this->ni.isEmpty() || this->nj.isEmpty() || 35 this->ibegin.isEmpty() || this->jbegin.isEmpty()) 36 36 { 37 37 ERROR("CZoomDomain::checkValid(CDomain* domainSrc)", … … 40 40 else 41 41 { 42 int zoom_iend = zoom_ibegin + zoom_ni - 1;43 int zoom_jend = zoom_jbegin + zoom_nj - 1;42 int iend = ibegin + ni - 1; 43 int jend = jbegin + nj - 1; 44 44 45 if ( zoom_ibegin < 0 || zoom_jbegin < 0 || zoom_iend > ni_glo - 1 || zoom_jend > nj_glo - 1)45 if (ibegin < 0 || jbegin < 0 || iend > ni_glo - 1 || jend > nj_glo - 1) 46 46 ERROR("CZoomDomain::checkValid(CDomain* domainSrc)", 47 47 << "Zoom is wrongly defined, " 48 << "please check the values : ' zoom_ni' (" << zoom_ni.getValue() << "), 'zoom_nj' (" << zoom_nj.getValue() << "), "49 << "' zoom_ibegin' (" << zoom_ibegin.getValue() << "), 'zoom_jbegin' (" << zoom_jbegin.getValue() << ")");48 << "please check the values : 'ni' (" << ni.getValue() << "), 'nj' (" << nj.getValue() << "), " 49 << "'ibegin' (" << ibegin.getValue() << "), 'jbegin' (" << jbegin.getValue() << ")"); 50 50 } 51 51 } 52 52 else 53 53 { 54 zoom_ni = ni_glo;55 zoom_nj = nj_glo;56 zoom_ibegin = 0;57 zoom_jbegin = 0;54 ni = ni_glo; 55 nj = nj_glo; 56 ibegin = 0; 57 jbegin = 0; 58 58 } 59 59 } -
XIOS/trunk/src/test/test_complete.f90
r786 r787 88 88 89 89 CALL xios_set_axis_attr("axis_atm",n_glo=llm ,value=lval) ; 90 CALL xios_set_zoom_axis_attr("axis_atm_zoom",zoom_size=2);90 ! CALL xios_set_zoom_axis_attr("axis_atm_zoom",n=2); 91 91 92 92 CALL xios_set_domain_attr("domain_atm",ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, ni=ni,jbegin=jbegin,nj=nj, type='curvilinear') … … 97 97 CALL xios_set_domain_attr("domain_atm_zoom",data_dim=2, data_ibegin=-1, data_ni=ni+2, data_jbegin=-2, data_nj=nj+4) 98 98 CALL xios_set_domain_attr("domain_atm_zoom",lonvalue_2D=lon,latvalue_2D=lat) 99 CALL xios_set_zoom_domain_attr("domain_atm_zoom",zoom_ibegin=39, zoom_ni=20, zoom_jbegin=39, zoom_nj=5)99 ! CALL xios_set_zoom_domain_attr("domain_atm_zoom",ibegin=39, ni=20, jbegin=39, nj=5) 100 100 101 101 !!! Activation du groupe field_definition -
XIOS/trunk/src/transformation/axis_algorithm_zoom.cpp
r666 r787 15 15 { 16 16 zoomAxis->checkValid(axisSource); 17 zoomBegin_ = zoomAxis-> zoom_begin.getValue();18 zoom End_ = zoomAxis->zoom_end.getValue();19 zoom Size_ = zoomAxis->zoom_size.getValue();17 zoomBegin_ = zoomAxis->begin.getValue(); 18 zoomSize_ = zoomAxis->n.getValue(); 19 zoomEnd_ = zoomBegin_ + zoomSize_ - 1; 20 20 21 21 if (zoomSize_ > axisSource->n_glo.getValue()) -
XIOS/trunk/src/transformation/domain_algorithm_zoom.cpp
r664 r787 15 15 { 16 16 zoomDomain->checkValid(domainSource); 17 zoomIBegin_ = zoomDomain-> zoom_ibegin.getValue();18 zoomJBegin_ = zoomDomain-> zoom_jbegin.getValue();17 zoomIBegin_ = zoomDomain->ibegin.getValue(); 18 zoomJBegin_ = zoomDomain->jbegin.getValue(); 19 19 20 zoomNi_ = zoomDomain-> zoom_ni.getValue();21 zoomNj_ = zoomDomain-> zoom_nj.getValue();20 zoomNi_ = zoomDomain->ni.getValue(); 21 zoomNj_ = zoomDomain->nj.getValue(); 22 22 23 23 zoomIEnd_ = zoomIBegin_ + zoomNi_ - 1;
Note: See TracChangeset
for help on using the changeset viewer.