From d22b4c49fa916bcbd89ed877ad8eb19c47020b56 Mon Sep 17 00:00:00 2001 From: Rob Farmer Date: Tue, 29 Aug 2023 12:59:12 +0200 Subject: [PATCH] Get colors module working with updated gfort2py --- mesa_models/colors.py | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mesa_models/colors.py b/mesa_models/colors.py index fdba5d2..e7fb59d 100644 --- a/mesa_models/colors.py +++ b/mesa_models/colors.py @@ -13,10 +13,10 @@ ierr = 0 -fnames = np.array([os.path.join(pym.DATA_DIR,'colors','lcb98cor.dat')],dtype='S') +fnames = np.array(['lcb98cor.dat'],dtype='S') -# Currently broken in gfort2py -col_lib.colors_init(len(fnames),fnames,11,ierr) +# Needs gfort2py >=2.2.1 +col_lib.colors_init(len(fnames),fnames,np.array([11]),ierr) diff --git a/requirements.txt b/requirements.txt index 552291c..dbda4c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -gfort2py>=2.0.0 \ No newline at end of file +gfort2py>=2.2.1