Fix zonal mean control data output in control file check

hiromatsui · hiromatsui · commit 094d3df6e608 · 2025-10-08T09:55:28.000+09:00
diff --git a/src/Fortran_libraries/MHD_src/IO/t_control_data_dynamo_sects.f90 b/src/Fortran_libraries/MHD_src/IO/t_control_data_dynamo_sects.f90
@@ -227,7 +227,7 @@ subroutine write_single_sect_ctl                                  &
       integer(kind = kint), intent(inout) :: level
 !
 !
-      if(psf_ctls%num_psf_ctl .gt. 0) return
+      if(psf_ctls%num_psf_ctl .le. 0) return
       call sel_write_control_4_psf_file(id_control, hd_section,         &
      &    psf_ctls%fname_psf_ctl(1), psf_ctls%psf_ctl_struct(1), level)
 !
diff --git a/src/Jupyter/.ipynb_checkpoints/Calypso_control_glossary-checkpoint.ipynb b/src/Jupyter/.ipynb_checkpoints/Calypso_control_glossary-checkpoint.ipynb
@@ -384,6 +384,7 @@
    "cell_type": "markdown",
    "id": "20895d95-f3f2-48bd-9be4-995dc03ac98b",
    "metadata": {
+    "jp-MarkdownHeadingCollapsed": true,
     "tags": []
    },
    "source": [
@@ -424,6 +425,7 @@
    "cell_type": "markdown",
    "id": "8a2c2e12-e529-4104-a3ac-128852bbd3f8",
    "metadata": {
+    "jp-MarkdownHeadingCollapsed": true,
     "tags": []
    },
    "source": [
@@ -455,6 +457,7 @@
    "cell_type": "markdown",
    "id": "b5c583c0-c2c8-46c8-b95c-f286414cc552",
    "metadata": {
+    "jp-MarkdownHeadingCollapsed": true,
     "tags": []
    },
    "source": [
@@ -484,7 +487,9 @@
   {
    "cell_type": "markdown",
    "id": "1870a03b-95f3-430a-8e7b-26e33809ccda",
-   "metadata": {},
+   "metadata": {
+    "jp-MarkdownHeadingCollapsed": true
+   },
    "source": [
     "##### List of fields with equatorial symmetry"
    ]
@@ -518,6 +523,7 @@
    "cell_type": "markdown",
    "id": "bdc523c8-2a11-424d-83cf-24d41470e983",
    "metadata": {
+    "jp-MarkdownHeadingCollapsed": true,
     "tags": []
    },
    "source": [
@@ -555,6 +561,7 @@
    "cell_type": "markdown",
    "id": "5451dc1f-4045-45d1-910e-042d251e5a19",
    "metadata": {
+    "jp-MarkdownHeadingCollapsed": true,
     "tags": []
    },
    "source": [
@@ -736,7 +743,6 @@
    "cell_type": "markdown",
    "id": "5b661b94-2687-48b4-a832-ee77284c648d",
    "metadata": {
-    "jp-MarkdownHeadingCollapsed": true,
     "tags": []
    },
    "source": [
@@ -767,68 +773,9 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 28,
-   "id": "511f8887-47b5-4ce6-99cc-d9b17702aa36",
+   "cell_type": "markdown",
+   "id": "bf6bddcf-9411-4452-a4c0-776929c93b60",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "7afb2ff8ea9645a1a94a34340e87d49d",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Output()"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "54e1ddd5dc244a8f8e5d6f70fb668300",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Textarea(value='      array dimless_ctl 6\\n        dimless_ctl  Pr                   1.0e-0\\n        dimless_c…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "9fc2ec3ac06c4bb695187cadcea834e5",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Button(button_style='success', description='Update Equation', style=ButtonStyle())"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "589ca33d43a0493aba6181f42b122ad7",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Output()"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
    "source": [
     "a = Dimless_ctl_Editor(ctl)"
    ]
diff --git a/src/Jupyter/Calypso_control_glossary.ipynb b/src/Jupyter/Calypso_control_glossary.ipynb
@@ -743,7 +743,6 @@
    "cell_type": "markdown",
    "id": "5b661b94-2687-48b4-a832-ee77284c648d",
    "metadata": {
-    "jp-MarkdownHeadingCollapsed": true,
     "tags": []
    },
    "source": [
@@ -774,68 +773,9 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 28,
-   "id": "511f8887-47b5-4ce6-99cc-d9b17702aa36",
+   "cell_type": "markdown",
+   "id": "bf6bddcf-9411-4452-a4c0-776929c93b60",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "7afb2ff8ea9645a1a94a34340e87d49d",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Output()"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "54e1ddd5dc244a8f8e5d6f70fb668300",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Textarea(value='      array dimless_ctl 6\\n        dimless_ctl  Pr                   1.0e-0\\n        dimless_c…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "9fc2ec3ac06c4bb695187cadcea834e5",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Button(button_style='success', description='Update Equation', style=ButtonStyle())"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "589ca33d43a0493aba6181f42b122ad7",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Output()"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
    "source": [
     "a = Dimless_ctl_Editor(ctl)"
    ]
diff --git a/tests/Control_file_check/Makefile b/tests/Control_file_check/Makefile
@@ -16,7 +16,7 @@ all: test
 
 test:
 	make clean
-	~/src_kemo/bin/utilities/check_control_mhd control_MHD > log.txt
+	$(TARGET_CONTROL_MHD_CHECK) control_MHD > log.txt
 	diff -w log.txt reference/control_checked.txt
 	@echo 'Control file check test is succeessfully finished.'
 
diff --git a/tests/Control_file_check/control_MHD b/tests/Control_file_check/control_MHD
@@ -388,3 +388,4 @@ begin MHD_control
     file zonal_mean_section_ctl      'controls/control_zonal_mean'
   end dynamo_vizs_control
 end MHD_control
+

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ subroutine write_single_sect_ctl &`
`227`	`227`	`integer(kind = kint), intent(inout) :: level`
`228`	`228`	`!`
`229`	`229`	`!`
`230`		`- if(psf_ctls%num_psf_ctl .gt. 0) return`
	`230`	`+ if(psf_ctls%num_psf_ctl .le. 0) return`
`231`	`231`	`call sel_write_control_4_psf_file(id_control, hd_section, &`
`232`	`232`	`& psf_ctls%fname_psf_ctl(1), psf_ctls%psf_ctl_struct(1), level)`
`233`	`233`	`!`