Changeset 1919

Timestamp:

07/20/20 12:22:40 (4 years ago)

Author:

yushan

Message:

trunk : bug in routine checkValid in extract_domain_to_axis

Location:

XIOS/trunk

Files:

• generic_testcase/context_atm.xml (modified) (6 diffs)
• generic_testcase/iodef.xml (modified) (1 diff)
• generic_testcase/param.def (modified) (1 diff)
• src/node/extract_domain_to_axis.cpp (modified) (2 diffs)

XIOS/trunk/generic_testcase/context_atm.xml

@@ -7 +7 @@
     <domain id="domain" />
     <domain id="other_domain" />
-  </domain>
-  
+    <domain id="dst_domain" ni_glo="36" nj_glo="18" type="rectilinear"/>
+  </domain_definition>
+
   <axis_definition>
     <axis id="axis" />
@@ -15 +16 @@
     <axis id="ensemble" />
 
+
     <axis id="other_axis" />
     <axis id="other_domain_X" />
@@ -41 +43 @@
       <axis axis_ref="axis" />
     </grid>
+   
+
+
 
     <grid id="grid_X">
@@ -294 +299 @@
 
   <file_definition  type="one_file" >
-    
-    <file id="atm_output" output_freq="1ts" type="one_file" enabled="true">
+    <file id="atm_output_reduction" output_freq="6ts" type="one_file" enabled="true">
+       <field field_ref="field2D" freq_op="3ts" operation="average" name="field2D_average"/>
+       <field field_ref="field2D" freq_op="3ts" operation="accumulate" name="field2D_sum"/>
+       <field field_ref="field2D" freq_op="3ts" operation="maximum" name="field2D_max"/>
+       <field field_ref="field2D" freq_op="3ts" operation="minimum" name="field2D_min"/>
+    </file>
+   
+    <file id="atm_output_ref" output_freq="1ts" type="one_file" enabled="true">
+       <field field_ref="field2D"   />
+    </file>
+
+
+  
+    <file id="atm_output" output_freq="1ts" type="one_file" enabled="false">
        <field field_ref="field3D" />
        <field field_ref="field2D" /> 
@@ -309 +326 @@
     </file>
 
-    <file id="atm_output_other" output_freq="1ts" type="one_file" enabled="true">
+    <file id="atm_output_other" output_freq="1ts" type="one_file" enabled="false">
        <field field_ref="other_field3D" />
        <field field_ref="other_field2D" /> 
@@ -323 +340 @@
     </file>
 
-    <file id="atm_output_W" output_freq="1ts" enabled="true">
+    <file id="atm_output_W" output_freq="1ts" enabled="false">
        <field field_ref="field3D_W" />
        <field field_ref="field2D_W" /> 

XIOS/trunk/generic_testcase/iodef.xml

@@ -9 +9 @@
       <variable id="domain"> lmdz </variable>
       <variable id="domain_mask"> true </variable>
-      <variable id="axis_mask"> true </variable>
+      <variable id="axis_mask"> false </variable>
       <variable id="init_field2D"> rank </variable>
       <variable id="ni"> 36 </variable>

XIOS/trunk/generic_testcase/param.def

@@ -1 +1 @@
 &params_run
 duration='1d'
-nb_proc_atm=1
+nb_proc_atm=4
 /

XIOS/trunk/src/node/extract_domain_to_axis.cpp

@@ -66 +66 @@
     {
       case direction_attr::jDir:
-        if (axis_n_glo != domain_ni_glo)
+        if (axis_n_glo != domain_nj_glo)
           ERROR("CExtractDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-            << "Extract domain along j, axis destination should have n_glo equal to ni_glo of domain source"
-            << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_ni_glo << std::endl
+            << "Extract domain along j, axis destination should have n_glo equal to nj_glo of domain source"
+            << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_nj_glo << std::endl
             << "Axis destination " << axisDst->getId() << " has n_glo " << axis_n_glo);
-        if ((position < 0) || (position > domain_ni_glo))
+        if ((position < 0) || (position >= domain_ni_glo))
         ERROR("CExtractDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-          << "Extract domain along j, position should be inside 0 and ni_glo of domain source"
-          << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_ni_glo << std::endl
+          << "Extract domain along j, position should be inside 0 and ni_glo-1 of domain source"
+          << "Domain source " <<domainSrc->getId() << " has ni_glo " << domain_ni_glo << std::endl
           << "Axis destination " << axisDst->getId() << std::endl
           << "Position " << position);
@@ -80 +80 @@
 
       case direction_attr::iDir:
-        if (axis_n_glo != domain_nj_glo)
+        if (axis_n_glo != domain_ni_glo)
           ERROR("CExtractDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-            << "Extract domain along i, axis destination should have n_glo equal to nj_glo of domain source"
-            << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_nj_glo << std::endl
+            << "Extract domain along i, axis destination should have n_glo equal to ni_glo of domain source"
+            << "Domain source " <<domainSrc->getId() << " has ni_glo " << domain_ni_glo << std::endl
             << "Axis destination " << axisDst->getId() << " has n_glo " << axis_n_glo);
-        if ((position < 0) || (position > domain_nj_glo))
+        if ((position < 0) || (position >= domain_nj_glo))
         ERROR("CExtractDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-          << "Extract domain along i, position should be inside 0 and nj_glo of domain source"
-          << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_ni_glo << std::endl
+          << "Extract domain along i, position should be inside 0 and nj_glo-1 of domain source"
+          << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_nj_glo << std::endl
           << "Axis destination " << axisDst->getId() << std::endl
           << "Position " << position);