Skip to content

Commit 7d35003

Browse files
billsacksbillsacks
authored
Merge pull request #12 from NCAR/billsacks/longer_var_list
Allow longer variable list for files Also, make this a parameter rather than a duplicated magic number.
2 parents d0a8c4d + 7866f56 commit 7d35003

7 files changed

+23
-86
lines changed

‎libglad/glad_io.F90.default

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
22
! WARNING: this file was automatically generated on
3-
! Thu, 16 Nov 2017 22:28:05 +0000
3+
! Mon, 26 Feb 2018 02:27:00 +0000
44
! from ncdf_template.F90.in
55
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
66

@@ -45,14 +45,14 @@ module glad_io
4545
! written by Magnus Hagdorn, 2004
4646

4747
use glad_type
48+
use glimmer_ncdf
4849

4950
implicit none
5051

5152
private :: get_xtype, is_enabled, is_enabled_0dint, is_enabled_1dint, &
5253
is_enabled_2dint, is_enabled_0dreal, is_enabled_1dreal, is_enabled_2dreal, is_enabled_3dreal
5354

54-
character(310), save :: restart_variable_list='' ! list of variables needed for a restart
55-
!TODO change 310 to a variable - see glimmer_ncdf.F90 in the definition for type glimmer_nc_stat for other instances of this value.
55+
character(glimmer_nc_vars_len), save :: restart_variable_list='' ! list of variables needed for a restart
5656

5757
interface is_enabled ! MJH 10/21/13: Interface needed for determining if arrays have been enabled. See notes below in glad_io_create.
5858
module procedure is_enabled_0dint
@@ -73,7 +73,6 @@ contains
7373
! open all netCDF files for output
7474
use glad_type
7575
use glide_types
76-
use glimmer_ncdf
7776
use glimmer_ncio
7877
implicit none
7978
type(glide_global_type) :: model
@@ -99,7 +98,6 @@ contains
9998
! if necessary write to netCDF files
10099
use glad_type
101100
use glide_types
102-
use glimmer_ncdf
103101
use glimmer_ncio
104102
implicit none
105103
type(glad_instance) :: data
@@ -146,7 +144,6 @@ contains
146144
use parallel
147145
use glide_types
148146
use glad_type
149-
use glimmer_ncdf
150147
use glimmer_ncio
151148
use glimmer_map_types
152149
use glimmer_log
@@ -378,7 +375,6 @@ contains
378375
subroutine glad_io_write(outfile,data)
379376
use parallel
380377
use glad_type
381-
use glimmer_ncdf
382378
use glimmer_paramets
383379
use glimmer_scales
384380
implicit none
@@ -547,7 +543,6 @@ contains
547543
! read from netCDF file
548544
use glad_type
549545
use glide_types
550-
use glimmer_ncdf
551546
use glimmer_ncio
552547
implicit none
553548
type(glad_instance) :: data
@@ -583,7 +578,6 @@ contains
583578
! Read data from forcing files
584579
use glimmer_log
585580
use glide_types
586-
use glimmer_ncdf
587581

588582
implicit none
589583
type(glad_instance) :: data
@@ -635,7 +629,6 @@ contains
635629
! read variables from a netCDF file
636630
use parallel
637631
use glimmer_log
638-
use glimmer_ncdf
639632
use glad_type
640633
use glimmer_paramets
641634
use glimmer_scales
@@ -772,7 +765,6 @@ contains
772765
! check if dimension sizes in file match dims of model
773766
use parallel
774767
use glimmer_log
775-
use glimmer_ncdf
776768
use glide_types
777769
use glad_type
778770
implicit none
@@ -795,7 +787,6 @@ contains
795787
use parallel
796788
use glide_types
797789
use glad_type
798-
use glimmer_ncdf
799790
implicit none
800791
type(glimmer_nc_output), pointer :: outfile
801792
! structure containg output netCDF descriptor
@@ -815,7 +806,6 @@ contains
815806
subroutine glad_avg_reset(outfile,data)
816807
use parallel
817808
use glad_type
818-
use glimmer_ncdf
819809
implicit none
820810
type(glimmer_nc_output), pointer :: outfile
821811
! structure containg output netCDF descriptor
@@ -836,7 +826,6 @@ contains
836826

837827
!> apply default type to be used in netCDF file
838828
integer function get_xtype(outfile,xtype)
839-
use glimmer_ncdf
840829
implicit none
841830
type(glimmer_nc_output), pointer :: outfile !< derived type holding information about output file
842831
integer, intent(in) :: xtype !< the external netCDF type

‎libglad/glad_mbal_io.F90.default

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
22
! WARNING: this file was automatically generated on
3-
! Thu, 16 Nov 2017 22:28:05 +0000
3+
! Mon, 26 Feb 2018 02:27:00 +0000
44
! from ncdf_template.F90.in
55
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
66

@@ -45,14 +45,14 @@ module glad_mbal_io
4545
! written by Magnus Hagdorn, 2004
4646

4747
use glad_type
48+
use glimmer_ncdf
4849

4950
implicit none
5051

5152
private :: get_xtype, is_enabled, is_enabled_0dint, is_enabled_1dint, &
5253
is_enabled_2dint, is_enabled_0dreal, is_enabled_1dreal, is_enabled_2dreal, is_enabled_3dreal
5354

54-
character(310), save :: restart_variable_list='' ! list of variables needed for a restart
55-
!TODO change 310 to a variable - see glimmer_ncdf.F90 in the definition for type glimmer_nc_stat for other instances of this value.
55+
character(glimmer_nc_vars_len), save :: restart_variable_list='' ! list of variables needed for a restart
5656

5757
interface is_enabled ! MJH 10/21/13: Interface needed for determining if arrays have been enabled. See notes below in glad_mbal_io_create.
5858
module procedure is_enabled_0dint
@@ -73,7 +73,6 @@ contains
7373
! open all netCDF files for output
7474
use glad_type
7575
use glide_types
76-
use glimmer_ncdf
7776
use glimmer_ncio
7877
implicit none
7978
type(glide_global_type) :: model
@@ -99,7 +98,6 @@ contains
9998
! if necessary write to netCDF files
10099
use glad_type
101100
use glide_types
102-
use glimmer_ncdf
103101
use glimmer_ncio
104102
implicit none
105103
type(glad_instance) :: data
@@ -146,7 +144,6 @@ contains
146144
use parallel
147145
use glide_types
148146
use glad_type
149-
use glimmer_ncdf
150147
use glimmer_ncio
151148
use glimmer_map_types
152149
use glimmer_log
@@ -464,7 +461,6 @@ contains
464461
subroutine glad_mbal_io_write(outfile,data)
465462
use parallel
466463
use glad_type
467-
use glimmer_ncdf
468464
use glimmer_paramets
469465
use glimmer_scales
470466
implicit none
@@ -612,7 +608,6 @@ contains
612608
! read from netCDF file
613609
use glad_type
614610
use glide_types
615-
use glimmer_ncdf
616611
use glimmer_ncio
617612
implicit none
618613
type(glad_instance) :: data
@@ -648,7 +643,6 @@ contains
648643
! Read data from forcing files
649644
use glimmer_log
650645
use glide_types
651-
use glimmer_ncdf
652646

653647
implicit none
654648
type(glad_instance) :: data
@@ -700,7 +694,6 @@ contains
700694
! read variables from a netCDF file
701695
use parallel
702696
use glimmer_log
703-
use glimmer_ncdf
704697
use glad_type
705698
use glimmer_paramets
706699
use glimmer_scales
@@ -722,7 +715,6 @@ contains
722715
! check if dimension sizes in file match dims of model
723716
use parallel
724717
use glimmer_log
725-
use glimmer_ncdf
726718
use glide_types
727719
use glad_type
728720
implicit none
@@ -817,7 +809,6 @@ contains
817809
use parallel
818810
use glide_types
819811
use glad_type
820-
use glimmer_ncdf
821812
implicit none
822813
type(glimmer_nc_output), pointer :: outfile
823814
! structure containg output netCDF descriptor
@@ -837,7 +828,6 @@ contains
837828
subroutine glad_mbal_avg_reset(outfile,data)
838829
use parallel
839830
use glad_type
840-
use glimmer_ncdf
841831
implicit none
842832
type(glimmer_nc_output), pointer :: outfile
843833
! structure containg output netCDF descriptor
@@ -858,7 +848,6 @@ contains
858848

859849
!> apply default type to be used in netCDF file
860850
integer function get_xtype(outfile,xtype)
861-
use glimmer_ncdf
862851
implicit none
863852
type(glimmer_nc_output), pointer :: outfile !< derived type holding information about output file
864853
integer, intent(in) :: xtype !< the external netCDF type

‎libglide/glide_io.F90.default

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
22
! WARNING: this file was automatically generated on
3-
! Thu, 16 Nov 2017 22:28:05 +0000
3+
! Mon, 26 Feb 2018 02:27:00 +0000
44
! from ncdf_template.F90.in
55
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
66

@@ -46,14 +46,14 @@ module glide_io
4646
! written by Magnus Hagdorn, 2004
4747

4848
use glide_types
49+
use glimmer_ncdf
4950

5051
implicit none
5152

5253
private :: get_xtype, is_enabled, is_enabled_0dint, is_enabled_1dint, &
5354
is_enabled_2dint, is_enabled_0dreal, is_enabled_1dreal, is_enabled_2dreal, is_enabled_3dreal
5455

55-
character(310), save :: restart_variable_list='' ! list of variables needed for a restart
56-
!TODO change 310 to a variable - see glimmer_ncdf.F90 in the definition for type glimmer_nc_stat for other instances of this value.
56+
character(glimmer_nc_vars_len), save :: restart_variable_list='' ! list of variables needed for a restart
5757

5858
interface is_enabled ! MJH 10/21/13: Interface needed for determining if arrays have been enabled. See notes below in glide_io_create.
5959
module procedure is_enabled_0dint
@@ -74,7 +74,6 @@ contains
7474
! open all netCDF files for output
7575
use glide_types
7676
use glide_types
77-
use glimmer_ncdf
7877
use glimmer_ncio
7978
implicit none
8079
type(glide_global_type) :: model
@@ -100,7 +99,6 @@ contains
10099
! if necessary write to netCDF files
101100
use glide_types
102101
use glide_types
103-
use glimmer_ncdf
104102
use glimmer_ncio
105103
implicit none
106104
type(glide_global_type) :: data
@@ -147,7 +145,6 @@ contains
147145
use parallel
148146
use glide_types
149147
use glide_types
150-
use glimmer_ncdf
151148
use glimmer_ncio
152149
use glimmer_map_types
153150
use glimmer_log
@@ -4811,7 +4808,6 @@ contains
48114808
subroutine glide_io_write(outfile,data)
48124809
use parallel
48134810
use glide_types
4814-
use glimmer_ncdf
48154811
use glimmer_paramets
48164812
use glimmer_scales
48174813
implicit none
@@ -6147,7 +6143,6 @@ contains
61476143
! read from netCDF file
61486144
use glide_types
61496145
use glide_types
6150-
use glimmer_ncdf
61516146
use glimmer_ncio
61526147
implicit none
61536148
type(glide_global_type) :: data
@@ -6183,7 +6178,6 @@ contains
61836178
! Read data from forcing files
61846179
use glimmer_log
61856180
use glide_types
6186-
use glimmer_ncdf
61876181

61886182
implicit none
61896183
type(glide_global_type) :: data
@@ -6235,7 +6229,6 @@ contains
62356229
! read variables from a netCDF file
62366230
use parallel
62376231
use glimmer_log
6238-
use glimmer_ncdf
62396232
use glide_types
62406233
use glimmer_paramets
62416234
use glimmer_scales
@@ -7778,7 +7771,6 @@ contains
77787771
! check if dimension sizes in file match dims of model
77797772
use parallel
77807773
use glimmer_log
7781-
use glimmer_ncdf
77827774
use glide_types
77837775
use glide_types
77847776
implicit none
@@ -7873,7 +7865,6 @@ contains
78737865
use parallel
78747866
use glide_types
78757867
use glide_types
7876-
use glimmer_ncdf
78777868
implicit none
78787869
type(glimmer_nc_output), pointer :: outfile
78797870
! structure containg output netCDF descriptor
@@ -7923,7 +7914,6 @@ contains
79237914
subroutine glide_avg_reset(outfile,data)
79247915
use parallel
79257916
use glide_types
7926-
use glimmer_ncdf
79277917
implicit none
79287918
type(glimmer_nc_output), pointer :: outfile
79297919
! structure containg output netCDF descriptor
@@ -7974,7 +7964,6 @@ contains
79747964

79757965
!> apply default type to be used in netCDF file
79767966
integer function get_xtype(outfile,xtype)
7977-
use glimmer_ncdf
79787967
implicit none
79797968
type(glimmer_nc_output), pointer :: outfile !< derived type holding information about output file
79807969
integer, intent(in) :: xtype !< the external netCDF type

‎libglimmer/glimmer_ncdf.F90

+6-3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ module glimmer_ncdf
4242

4343
implicit none
4444

45+
integer, parameter :: glimmer_nc_vars_len = 1024
46+
!> maximum length for lists of variables in file
47+
4548
integer, parameter :: glimmer_nc_meta_len = 100
4649
!> maximum length for meta data
4750

@@ -114,9 +117,9 @@ module glimmer_ncdf
114117
! TODO - Create a variable for vars length so it can be made longer (Matt has this implemented in his subglacial hydrology branch)
115118
! Apply it here for vars, vars_copy and to restart_variable_list in glimmer_ncparams.F90
116119

117-
character(len=310) vars !> string containing variables to be processed
118-
logical :: restartfile = .false. !> Set to true if we're writing a restart file
119-
character(len=310) vars_copy !> string containing variables to be processed (retained copy)
120+
character(len=glimmer_nc_vars_len) :: vars !> string containing variables to be processed
121+
logical :: restartfile = .false. !> Set to true if we're writing a restart file
122+
character(len=glimmer_nc_vars_len) :: vars_copy !> string containing variables to be processed (retained copy)
120123

121124
end type glimmer_nc_stat
122125

0 commit comments

Comments
 (0)