conflict resolution

Mohid-Water-Modelling-System · Aug 17, 2018 · d090197 · d090197
1 parent c55d1f9
commit d090197
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Software/MOHIDBase2/ModuleHorizontalGrid.F90 b/Software/MOHIDBase2/ModuleHorizontalGrid.F90
@@ -8523,7 +8523,8 @@ subroutine GetHorizontalGrid(HorizontalGridID, XX_IE, YY_IE, XX_Z, YY_Z,
         real, dimension(:   ), pointer, optional    :: XX_Z, YY_Z, XX_U, YY_U, XX_V, YY_V, XX_Cross, YY_Cross
         real, dimension(:, :), pointer, optional    :: DXX, DYY, DZX, DZY
         real, dimension(:, :), pointer, optional    :: DUX, DUY, DVX, DVY
-        integer, dimension(:, :), pointer, optional :: IV, JV, IU, JU, IZ, JZ     !Jo�o Sobrinho
+        integer, dimension(:, :), pointer, optional :: IV, JV
+		integer, dimension(:, :), pointer, optional :: IU, JU, IZ, JZ !Joao Sobrinho
         real, dimension(:   ), pointer, optional    :: XX, YY
         integer, optional,  intent(OUT)             :: STAT