Fix issue with actually building and running test

MetOffice · Jun 20, 2024 · 68df247 · 68df247
1 parent a17db3b
commit 68df247
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/xios_examples/mix_freq_output/Makefile b/xios_examples/mix_freq_output/Makefile
@@ -55,4 +55,5 @@ run:
 
 # cleanup
 clean:
-	rm -f *.exe *.o *.mod *.MOD *.out *.err *.nc
+#	rm -f *.exe *.o *.mod *.MOD *.out *.err *.nc
+	rm -f *.exe *.o *.mod
diff --git a/xios_examples/mix_freq_output/main.xml b/xios_examples/mix_freq_output/main.xml
@@ -24,8 +24,8 @@
     </field_definition>
 
 
-  <file_definition type="one_file">
-    <file id="mixed_frequency" output_freq="1ts">
+  <file_definition type="one_file" enabled=".TRUE.">
+    <file id="mixed_frequency" name="mixed_frequency" output_freq="1ts" enabled=".TRUE.">
       <field_group operation="once">
         <field field_ref="pressure" />
         <field field_ref="temperature"/>

diff --git a/xios_examples/mix_freq_output/multiple_timestep.F90 b/xios_examples/mix_freq_output/multiple_timestep.F90
@@ -119,7 +119,7 @@ subroutine simulate()
       call xios_get_current_date(current)
       ! Send the pressure data to the output file.
       call xios_send_field('pressure', inpdata)
-      ! Send the pressure data to the output file.
+      ! Send the temperature data to the output file.
       call xios_send_field('temperature', intdata)
     enddo
 

diff --git a/...amples/mix_freq_output/mixed_frequency.py → ...s/mix_freq_output/test_mixed_frequency.py b/...amples/mix_freq_output/mixed_frequency.py → ...s/mix_freq_output/test_mixed_frequency.py
@@ -22,5 +22,10 @@ def test_mixed_frequency_output(self):
         """
         Check/test the frequency of outputted fields are correct.
         """
+        with open('{}/xios.xml'.format(self.test_dir)) as cxml:
+            print(cxml.read(), flush=True)
+        subprocess.run(['mpiexec', '-n', '1', './multiple_timestep.exe', ':',
+                        '-n', '1', './xios_server.exe'],
+                        cwd=self.test_dir, check=True)
         self.assertTrue(False)