From a917ca52b135b92b2d4f6db09e569ae771bc59c5 Mon Sep 17 00:00:00 2001 From: Timothy Nunn Date: Wed, 14 Feb 2024 16:44:34 +0000 Subject: [PATCH] Make tauscl an old fortran character array to ensure f2py compatible in lower numpy versions --- process/physics.py | 2 +- source/fortran/physics_variables.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/process/physics.py b/process/physics.py index 9add436756..0bfc45a4f6 100644 --- a/process/physics.py +++ b/process/physics.py @@ -4236,7 +4236,7 @@ def outplas(self): po.ocmmnt( self.outfile, - f"Confinement scaling law: { physics_variables.tauscl[physics_variables.isc-1]}", + f"Confinement scaling law: {f2py_compatible_to_string(physics_variables.tauscl[physics_variables.isc-1])}", ) po.ovarrf( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 0cb54664fb..00ef13fcd8 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -394,7 +394,7 @@ module physics_variables integer :: isc !! switch for energy confinement time scaling law (see description in `tauscl`) - character(len=24), parameter, dimension(ipnlaws) :: tauscl = (/ & + character*24, parameter, dimension(ipnlaws) :: tauscl = (/ & 'Neo-Alcator (ohmic)', & 'Mirnov (H)', & 'Merezkhin-Muhkovatov (L)', &