From dbf8e8217f0f4350aa10df7982c3865d615b0289 Mon Sep 17 00:00:00 2001
From: ashleymedin <ashley.vanbeusekom@gmail.com>
Date: Wed, 10 May 2023 16:17:26 +0900
Subject: [PATCH] remove csv files
---
actorsChanges.txt | 43 +++--
build/source/dshare/csv_file.f90 | 274 ----------------------------
build/source/dshare/csv_file_1d.f90 | 22 ---
build/source/dshare/csv_file_2d.f90 | 19 --
4 files changed, 29 insertions(+), 329 deletions(-)
delete mode 100644 build/source/dshare/csv_file.f90
delete mode 100644 build/source/dshare/csv_file_1d.f90
delete mode 100644 build/source/dshare/csv_file_2d.f90
diff --git a/actorsChanges.txt b/actorsChanges.txt
index 5d8c757..e99432b 100644
--- a/actorsChanges.txt
+++ b/actorsChanges.txt
@@ -1,40 +1,55 @@
driver
-/summaActors_alarms.f90 -- remove
/summaActors_globalData.-- could combine and remove, renamed for now
/summaActors_type.f90 -- could combine and remove, renamed for now, adds a new function, but don't use both
/summaActors_util.f90 -- could combine and remove, renamed for now, adds a new function, but don't use both
/summaversion.inc -- remove
+/summaActors_alarms.f90 -- remove
/summaActors_globalData.-- could combine and remove, renamed for now
+/summaActors_type.f90 -- could combine and remove, renamed for now, adds a new function, but don't use both
+/summaActors_util.f90 -- could combine and remove, renamed for now, adds a new function, but don't use both
+/summaversion.inc -- remove
dshare
-/csv_file_1d.f90 -- remove not seeing it used anywhere?
/csv_file_2d.f90 -- remove not seeing it used anywhere?
/csv_file.f90 -- remove?? IS this only in kinsol? do we need?
-/data_types.f90 -- has a lot, could we add the new stuff as data_types_actors?
+/csv_file_1d.f90 -- remove?? not seeing it used anywhere?
+/csv_file_2d.f90 -- remove?? not seeing it used anywhere?
+/csv_file.f90 -- remove?? IS this only in kinsol? do we need?
+/data_types.f90 -- has a lot
/globalData.f90 -- remove with ACTORS_ACTIVE adds forcing stuff and tmZoneOffsetFracDay, fracJulday, yearLength not as global
/varLookup.f90 -- remove with ACTORS_ACTIVE uses a iso_c binding call
engine
-can remove sundials folder shouldn't need with SUNDIALS_ACTIVE
-/sundials/coupled_em.f90 -- remove with ACTORS_ACTIVE needs fracJulday, yearLength
/sundials/mDecisions.f90 -- remove with ACTORS_ACTIVE called with iso_c binding
/sundials/t2enthalpy.f90 -- remove
-
/alloc_fileAccess.f90 -- new
/allocspace[Actors].f90 -- this is a replacement, rename, and see how changes CHECK IF NECESSARY!
/check_icondActors.f90-- could combine and remove, renamed for now, adds a new function, but don't use both
/checkStruc.f90 -- remove
/coupled_em.f90 -- remove shouldn't need the non-sundials version
/derivforce.f90 -- remove with ACTORS_ACTIVE tmZoneOffsetFracDay needs to be variable not global
/ffile_info.f90 -- very different, call this ffile_infoActors?
/mDecisions.f90 -- remove shouldn't need the non-sundials version
/read_dimension.-- part of read_attrb, - very different, actors doesn't use rest of read_attribute which was cut, maybe better, but then this and the other changes in it should be applied to all versions! and I don't see it called anywhere in Actors ... removed BUT SHOULD IT JUST REPLACE THE SUMMA read_dimension?
+can remove sundials folder shouldn't need with SUNDIALS_ACTIVE
+/sundials/coupled_em.f90 -- remove with ACTORS_ACTIVE needs fracJulday, yearLength
+/sundials/mDecisions.f90 -- remove with ACTORS_ACTIVE called with iso_c binding
+/sundials/t2enthalpy.f90 -- remove
+/alloc_fileAccess.f90 -- new
+/allocspace[Actors].f90 -- this is a replacement, rename, and see how changes CHECK IF NECESSARY!
+/check_icondActors.f90-- could combine and remove, renamed for now, adds a new function, but don't use both
+/checkStruc.f90 -- remove
/coupled_em.f90 -- remove shouldn't need the non-sundials version
+/derivforce.f90 -- remove with ACTORS_ACTIVE tmZoneOffsetFracDay needs to be variable not global
+/ffile_info.f90 -- very different, call this ffile_infoActors?
+/mDecisions.f90 -- remove shouldn't need the non-sundials version
+/read_dimension.-- part of read_attrb, - very different, actors doesn't use rest of read_attribute which was cut, maybe better, but then this and the other changes in it should be applied to all versions! and I don't see it called anywhere in Actors ... removed BUT SHOULD IT JUST REPLACE THE SUMMA read_dimension?
- also Actors assumes don't have aspect variable .. why?
-
/read_pinit.f90 -- remove
/vegPhenlgy.f90 -- remove with ACTORS_ACTIVE needs fracJulday, yearLength
+/read_pinit.f90 -- remove
/vegPhenlgy.f90 -- remove with ACTORS_ACTIVE needs fracJulday, yearLength
changed calls in run_oneHRU so can use (modded) currently in actors /derivforce.f90 /coupled_em.f90 /vegPhenlgy.f90 as is
-#ifdef IDA_ACTIVE
-#ifdef ACTORS_ACTIVE
-
-#ifndef ACTORS_ACTIVE
-
hookup
/ascii_util.f90 -- use Kyle's version everywhere!! (so remove)
/summaActors_FileManager.-- could combine and remove, renamed for now??
-lapack -- remove
/Makefile -- remove
/README -- remove
+lapack -- remove
+/Makefile -- remove
+/README -- remove
-netcdf
/def_output.f90 -- has a lot ... use Kyle's? Hard to tell which is Actors specific and which is just changed
/netcdf_util.f90 -- remove
/read_icondActors.-- has a lot ... could combine and remove, renamed for now,
/writeOutput.f90 -- part of modelwrite.f90 -- renamed to modelwrite so can replace, and then IS THIS VERSION BETTER can we change the other version and put a few compiler directives in?
/writeRestart.f90 -- remove, same in modelwrite, part of it
+netcdf
+/def_output.f90 -- has a lot ... use Kyle's? Hard to tell which is Actors specific and which is just changed
+/netcdf_util.f90 -- remove
+/read_icondActors.-- has a lot ... could combine and remove, renamed for now,
+/writeOutput.f90 -- part of modelwrite.f90 -- renamed to modelwrite so can replace, and then IS THIS VERSION BETTER can we change the other version and put a few compiler directives in?
/writeRestart.f90 -- remove, same in modelwrite, part of it
diff --git a/build/source/dshare/csv_file.f90 b/build/source/dshare/csv_file.f90
deleted file mode 100644
index 165809b..0000000
--- a/build/source/dshare/csv_file.f90
+++ /dev/null
@@ -1,274 +0,0 @@
-! csv_file.f90 --
-! Small module to facilitate writing CSV-files
-!
-! $Id: csv_file.f90,v 1.2 2006/03/26 19:03:53 arjenmarkus Exp $
-!
-! The module contains the following subroutines:
-! csv_next_record Advance to the next record
-! csv_write_integer Write a single integer to the CSV-file
-! csv_write_real Write a single real to the CSV-file
-! csv_write_dble Write a single double-precision real to the
-! CSV-file
-! csv_write_char Write a single character string to the
-! CSV-file
-! csv_write_integer_1d Write a 1D array of integers to the CSV-file
-! csv_write_real_1d Write a 1D array of reals to the CSV-file
-! csv_write_dble_1d Write a 1D array of double-precision real to
-! the CSV-file
-! csv_write_char_1d Write a 1D array of character strings to the
-! CSV-file
-! csv_write_integer_2d Write a 2D array of integers to the CSV-file
-! csv_write_real_2d Write a 2D array of reals to the CSV-file
-! csv_write_dble_2d Write a 2D array of double-precision real to
-! the CSV-file
-! csv_write_char_2d Write a 2D array of character strings to the
-! CSV-file
-!
-! For convenience, the generic name "csv_write" can be used
-! instead of the individual routines.
-!
-! The file to write to must already be opened as a LU-number
-! is passed.
-!
-! Layout of the CSV-file:
-! - single items are written to the end of the current record
-! - one-dimensional items are also written to the end of the current
-! record
-! - two-dimensional items are written to separate records, one for
-! each row
-! - except for the two-dimensional versions, all routines allow
-! you to suppress advancing to the next record:
-! - for single items you must indicate whether to advance or not
-! - for one-dimensional items, the argument is optional. Default
-! is to advance.
-!
-! Note on the format:
-! CSV-files apparently come in different guises (Kernighan and Pike,
-! The practice of Programming, Addison-Wesley, 1999). This module
-! uses the following rules:
-! - items are always separated by a single comma (,)
-! - string items are delimited by double quotes (")
-! - embedded double quotes are treated by doubling the quote
-! - trailing blanks are considered irrelevant
-!
-module csv_file
- implicit none
- interface csv_write
- module procedure csv_write_integer
- module procedure csv_write_integer_1d
- module procedure csv_write_integer_2d
- module procedure csv_write_char
- module procedure csv_write_char_1d
- module procedure csv_write_char_2d
- module procedure csv_write_real
- module procedure csv_write_real_1d
- module procedure csv_write_real_2d
- module procedure csv_write_dble
- module procedure csv_write_dble_1d
- module procedure csv_write_dble_2d
- end interface
-contains
-
-! csv_next_record --
-! Go to the next record (convenience routine)
-! Arguments:
-! lun LU-number of the CSV-file
-! Result:
-! The current record is closed, the next write will be to the
-! new record
-! Note:
-! This is a convenience routine, it may result in a superfluous
-! comma at the end of the previous record. This does not seem to
-! be problematic, though, for MS Excel
-!
-subroutine csv_next_record( lun )
- integer, intent(in) :: lun
-
- write(lun,'(a)') ''
-end subroutine csv_next_record
-
-! csv_write_integer/real/dble --
-! Write a single integer/real/double precision real to the CSV-file
-! Arguments:
-! lun LU-number of the CSV-file
-! value Value to write
-! advance Advance (.true.) or not, so that more items can be
-! written to the same record
-! Result:
-! The value is written to the current record of the CSV-file
-!
-subroutine csv_write_integer( lun, value, advance )
- integer, intent(in) :: lun
- integer, intent(in) :: value
- logical, intent(in) :: advance
-
- character(len=40) :: buffer
- write( buffer, '(I10)' ) value
- buffer = adjustl(buffer)
- if ( advance ) then
- write(lun,'(a)') trim(buffer)
- else
- ! Most probably: write the comma only when needed
- ! - depends on other actions
- write(lun,'(a,a)',advance='no') trim(buffer), ','
- endif
-end subroutine csv_write_integer
-
-subroutine csv_write_real( lun, value, advance )
- integer, intent(in) :: lun
- real, intent(in) :: value
- logical, intent(in) :: advance
-
- character(len=40) :: buffer
- write( buffer, '(G14.6)' ) value
- buffer = adjustl(buffer)
- if ( advance ) then
- write(lun,'(a)') trim(buffer)
- else
- ! Most probably: write the comma only when needed
- ! - depends on other actions
- write(lun,'(a,a)',advance='no') trim(buffer), ','
- endif
-end subroutine csv_write_real
-
-subroutine csv_write_dble( lun, value, advance )
- integer, intent(in) :: lun
- real(kind=kind(1.0d0)), intent(in) :: value
- logical, intent(in) :: advance
-
- character(len=40) :: buffer
- write( buffer, '(G20.12)' ) value
- buffer = adjustl(buffer)
- if ( advance ) then
- write(lun,'(a)') trim(buffer)
- else
- ! Most probably: write the comma only when needed
- ! - depends on other actions
- write(lun,'(a,a)',advance='no') trim(buffer), ','
- endif
-end subroutine csv_write_dble
-
-! csv_write_char --
-! Write a single character string to the CSV-file
-! Arguments:
-! lun LU-number of the CSV-file
-! value Value to write
-! advance Advance (.true.) or not, so that more items can be
-! written to the same record
-! Result:
-! The value is written to the current record of the CSV-file
-!
-subroutine csv_write_char( lun, value, advance )
- integer, intent(in) :: lun
- character(len=*), intent(in) :: value
- logical, intent(in) :: advance
-
- integer :: k
- integer :: pos
- integer :: posb
- character(len=2*len(value)) :: buffer
-
- buffer = value
-
- !
- ! Check for nasty characters (")
- !
- k = index( value,'"')
- pos = 1
- posb = 1
- do while ( k .ge. 1 )
- buffer(posb:) = value(pos:)
- buffer(posb+k:) = '"' // value(pos+k:)
- pos = pos + k + 1
- posb = posb + k + 2
- k = index( value(pos:),'"')
- enddo
-
- if ( advance ) then
- write(lun,'(3a)') '"',trim(buffer),'"'
- else
- write(lun,'(3a,a)',advance='no') '"',trim(buffer), '"', ','
- endif
-end subroutine csv_write_char
-
-! csv_write_integer/real/dble_1d --
-! Write a one-dimensional array of items to the CSV-file
-! Arguments:
-! lun LU-number of the CSV-file
-! array Array to write
-! advance Advance (.true.) or not, so that more items can be
-! written to the same record
-! Result:
-! The array is written to the current record of the CSV-file
-! Note:
-! Because the four routines of this type differ only in
-! the data type, we use an include file for the body.
-!
-subroutine csv_write_integer_1d( lun, array, advance )
- integer, dimension(:), intent(in) :: array
-
- include 'csv_file_1d.f90'
-
-end subroutine csv_write_integer_1d
-
-subroutine csv_write_real_1d( lun, array, advance )
- real, dimension(:), intent(in) :: array
-
- include 'csv_file_1d.f90'
-
-end subroutine csv_write_real_1d
-
-subroutine csv_write_dble_1d( lun, array, advance )
- real(kind=kind(1.0d0)), dimension(:), intent(in) :: array
-
- include 'csv_file_1d.f90'
-
-end subroutine csv_write_dble_1d
-
-subroutine csv_write_char_1d( lun, array, advance )
- character(len=*), dimension(:), intent(in) :: array
-
- include 'csv_file_1d.f90'
-
-end subroutine csv_write_char_1d
-
-! csv_write_integer/real/dble_2d --
-! Write a two-dimensional array of items to the CSV-file
-! Arguments:
-! lun LU-number of the CSV-file
-! array Array to write
-! Result:
-! The array is written to the current record of the CSV-file
-! Note:
-! Because the four routines of this type differ only in
-! the data type, we use an include file for the body.
-!
-subroutine csv_write_integer_2d( lun, array )
- integer, dimension(:,:), intent(in) :: array
-
- include 'csv_file_2d.f90'
-
-end subroutine csv_write_integer_2d
-
-subroutine csv_write_real_2d( lun, array )
- real, dimension(:,:), intent(in) :: array
-
- include 'csv_file_2d.f90'
-
-end subroutine csv_write_real_2d
-
-subroutine csv_write_dble_2d( lun, array )
- real(kind=kind(1.0d0)), dimension(:,:), intent(in) :: array
-
- include 'csv_file_2d.f90'
-
-end subroutine csv_write_dble_2d
-
-subroutine csv_write_char_2d( lun, array )
- character(len=*), dimension(:,:), intent(in) :: array
-
- include 'csv_file_2d.f90'
-
-end subroutine csv_write_char_2d
-
-end module csv_file
diff --git a/build/source/dshare/csv_file_1d.f90 b/build/source/dshare/csv_file_1d.f90
deleted file mode 100644
index 485fec1..0000000
--- a/build/source/dshare/csv_file_1d.f90
+++ /dev/null
@@ -1,22 +0,0 @@
-! cvs_file_1d.f90 --
-! Include file for csv_file.f90:
-! contains the body of the one-dimensional version of the
-! writing routines.
-!
-! $Id: csv_file_1d.f90,v 1.2 2006/03/26 19:03:53 arjenmarkus Exp $
-!
- integer, intent(in) :: lun
- logical, intent(in), optional :: advance
-
- logical :: adv
- integer :: i
-
- adv = .true.
- if ( present(advance) ) adv = advance
-
- do i = 1,size(array)-1
- call csv_write( lun, array(i), .false. )
- enddo
- call csv_write( lun, array(size(array)), adv )
-!
-! end of body
diff --git a/build/source/dshare/csv_file_2d.f90 b/build/source/dshare/csv_file_2d.f90
deleted file mode 100644
index 24d5e4f..0000000
--- a/build/source/dshare/csv_file_2d.f90
+++ /dev/null
@@ -1,19 +0,0 @@
-! cvs_file_2d.f90 --
-! Include file for csv_file.f90:
-! contains the body of the two-dimensional version of the
-! writing routines.
-!
-! $Id: csv_file_2d.f90,v 1.2 2006/03/26 19:03:53 arjenmarkus Exp $
-!
- integer, intent(in) :: lun
-
- logical :: adv
- integer :: i
-
- adv = .true.
-
- do i = 1,size(array,2)
- call csv_write( lun, array(:,i), adv )
- enddo
-!
-! end of body
--
GitLab