Merge lp:~r-nelson/fluidity/p2_netcdf_init into lp:fluidity

[Rhodri Nelson]

An update so that scalar fields with p > 1 can be initialised from a NetCDF file.

[Adam Candy (asc)]

Is this change already in the trunk too? If so, which revision does this merge request relate to?

review: Needs Information

[Rhodri Nelson (r-nelson)]

See the comment under the lp:~r-nelson/fluidity/parallel_sigma merge request. Will try and fix this later.

[lp:~r-nelson/fluidity/p2_netcdf_init]

3565. By Rhodri Nelson on 2011-09-07

Updating local changes.

[Rhodri Nelson (r-nelson)]

The correct changes seem to have been correctly upload now and so it should now be ready for review.

Unmerged revisions

3565. By Rhodri Nelson on 2011-09-07

Updating local changes.

=== modified file 'ocean_forcing/load_netcdf.F90'
--- ocean_forcing/load_netcdf.F90	2010-12-17 16:50:11 +0000
+++ ocean_forcing/load_netcdf.F90	2011-09-07 23:53:25 +0000
@@ -18,7 +18,7 @@
 
   type(scalar_field), intent(inout) :: field
   character(len=*), intent(in) :: path
-  type(vector_field), intent(in) :: position
+  type(vector_field), intent(inout) :: position
   character(len=OPTION_PATH_LEN) :: field_name, format
   real :: gravity_magnitude
   integer :: stat
@@ -47,18 +47,24 @@
 
   type(scalar_field), intent(inout) :: field
   character(len=*), intent(in) :: path
-  type(vector_field), intent(in) :: position
+  type(vector_field), intent(inout) :: position
   real, dimension(position%dim,node_count(position)) :: temp_pos
   character(len=FIELD_NAME_LEN) :: filename
   real, dimension(:), allocatable :: X, Y, Z
   
   integer :: NNodes, i
 
+  type(scalar_field) :: tempfield
+  integer :: stat
+  type(mesh_type), pointer :: input_mesh
+
+  call allocate(tempfield, position%mesh, name="TemporaryScalarField")
+
+  call zero(tempfield)
+
   call get_option(trim(path)//"/from_netcdf/file_name", filename)
 
-  assert(node_count(field)==node_count(position))
-
-  NNodes=node_count(field)
+  NNodes=node_count(tempfield)
 
   allocate(X(NNodes), Y(NNodes), Z(NNodes))
 
@@ -91,9 +97,12 @@
   call get_field_values(trim(filename)//char(0), X, Y, Z, NNodes)
 
   do i=1,NNodes
-     call set(field,i,Z(i))
+     call set(tempfield,i,Z(i))
   enddo
 
+  call remap_field(tempfield, field, stat)
+
+  call deallocate(tempfield)
   deallocate(X, Y, Z)
 
 end subroutine

=== modified file 'preprocessor/Initialise_Fields.F90'
--- preprocessor/Initialise_Fields.F90	2011-03-25 11:36:54 +0000
+++ preprocessor/Initialise_Fields.F90	2011-09-07 23:53:25 +0000
@@ -71,7 +71,7 @@
     !!< setting a boundary condition surface_field, a.o.
     type(scalar_field), intent(inout) :: field
     character(len=*), intent(in) :: path
-    type(vector_field), intent(in):: position
+    type(vector_field), intent(inout):: position
     !! if present use this time level, instead of that in the options tree
     real, optional, intent(in):: time
     character(len=*), intent(in), optional :: phase_path
@@ -536,7 +536,7 @@
     !! path should point to either /"path to field"/prescribed/value 
     !! or /"path to field"/prognostic/initial_condition
     character(len=*), intent(in) :: path
-    type(vector_field), intent(in):: position
+    type(vector_field), intent(inout):: position
     real, intent(in), optional :: time
     character(len=*), intent(in), optional :: phase_path