From 4fe1b27b97f2eba35693c586cd7ef27e2c0d56a8 Mon Sep 17 00:00:00 2001 From: Matt Hipsey Date: Thu, 4 Apr 2024 02:48:47 +0800 Subject: [PATCH] Read zoo.csv doubles as int Fixes issue #68 where non-integer numbers not getting parsed --- src/aed_zooplankton.F90 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/aed_zooplankton.F90 b/src/aed_zooplankton.F90 index 415a083..f9f5777 100644 --- a/src/aed_zooplankton.F90 +++ b/src/aed_zooplankton.F90 @@ -151,14 +151,14 @@ INTEGER FUNCTION load_csv(dbase, zoop_param, dbsize) CASE ('ffecal_zoo') ; zoop_param(dcol)%ffecal_zoo = extract_double(values(ccol)) CASE ('fexcr_zoo') ; zoop_param(dcol)%fexcr_zoo = extract_double(values(ccol)) CASE ('ffecal_sed') ; zoop_param(dcol)%ffecal_sed = extract_double(values(ccol)) - CASE ('theta_resp_zoo') ; zoop_param(dcol)%theta_resp_zoo = extract_integer(values(ccol)) - CASE ('Tstd_zoo') ; zoop_param(dcol)%Tstd_zoo = extract_integer(values(ccol)) - CASE ('Topt_zoo') ; zoop_param(dcol)%Topt_zoo = extract_integer(values(ccol)) - CASE ('Tmax_zoo') ; zoop_param(dcol)%Tmax_zoo = extract_integer(values(ccol)) + CASE ('theta_resp_zoo') ; zoop_param(dcol)%theta_resp_zoo = extract_double(values(ccol)) + CASE ('Tstd_zoo') ; zoop_param(dcol)%Tstd_zoo = extract_double(values(ccol)) + CASE ('Topt_zoo') ; zoop_param(dcol)%Topt_zoo = extract_double(values(ccol)) + CASE ('Tmax_zoo') ; zoop_param(dcol)%Tmax_zoo = extract_double(values(ccol)) CASE ('saltfunc_zoo') ; zoop_param(dcol)%saltfunc_zoo = extract_integer(values(ccol)) - CASE ('Smin_zoo') ; zoop_param(dcol)%Smin_zoo = extract_integer(values(ccol)) - CASE ('Smax_zoo') ; zoop_param(dcol)%Smax_zoo = extract_integer(values(ccol)) - CASE ('Sint_zoo') ; zoop_param(dcol)%Sint_zoo = extract_integer(values(ccol)) + CASE ('Smin_zoo') ; zoop_param(dcol)%Smin_zoo = extract_double(values(ccol)) + CASE ('Smax_zoo') ; zoop_param(dcol)%Smax_zoo = extract_double(values(ccol)) + CASE ('Sint_zoo') ; zoop_param(dcol)%Sint_zoo = extract_double(values(ccol)) CASE ('INC_zoo') ; zoop_param(dcol)%INC_zoo = extract_double(values(ccol)) CASE ('IPC_zoo') ; zoop_param(dcol)%IPC_zoo = extract_double(values(ccol)) CASE ('DOmin_zoo') ; zoop_param(dcol)%DOmin_zoo = extract_double(values(ccol))