← Back to branch summary

~grm08/fluidity/hilbert-for-pyop2

« back to all changes in this revision

Viewing changes to femtools/CV_Options.F90

  • Committer: asc
  • Date: 2010-12-09 13:22:29 UTC
  • Revision ID: svn-v4:5bf5533e-7014-46e3-b1bb-cce4b9d03719:trunk:2614
Adds the additional optional variable 'name' to complete_field_path in order to identify the name of the field investigated and tidies up sloppy use of the optional stat variable in complete_field_path.  (Note these are imported changes from the ice shelf branch).

Show diffs side-by-side

added added

removed removed

Lines of Context:
femtools/CV_Options.F90
152
152
                        "/face_value[0]/use_potential_flux")
153
153
 
154
154
    ! temporal discretisation options
155
 
    cv_options%limit_theta = have_option(trim(complete_field_path(option_path, stat))//&
 
155
    cv_options%limit_theta = have_option(trim(complete_field_path(option_path, stat=stat))//&
156
156
                        "/temporal_discretisation&
157
157
                        &/control_volumes/limit_theta")
158
 
    call get_option(trim(complete_field_path(option_path, stat))//&
 
158
    call get_option(trim(complete_field_path(option_path, stat=stat))//&
159
159
                        "/temporal_discretisation&
160
160
                        &/theta", cv_options%theta)
161
161
    if (cv_options%facevalue==CV_FACEVALUE_FIRSTORDERUPWIND) then
162
 
      call get_option(trim(complete_field_path(option_path, stat))//&
 
162
      call get_option(trim(complete_field_path(option_path, stat=stat))//&
163
163
                          "/temporal_discretisation&
164
164
                          &/control_volumes/pivot_theta", &
165
165
                          cv_options%ptheta, stat=stat)
189
189
      ! initialise it to something insane to make sure it will be noticed if used.
190
190
      cv_options%beta = -666.0
191
191
    else
192
 
      call get_option(trim(complete_field_path(option_path, stat))//&
 
192
      call get_option(trim(complete_field_path(option_path, stat=stat))//&
193
193
                          "/spatial_discretisation&
194
194
                          &/conservative_advection", &
195
195
                          cv_options%beta)