Visual fortran has incompatible compiler directives. Remove directive…

…s, add null subroutines, update makefiles and project files and docs.
rrusk · Oct 12, 2015 · 22f55ba · 22f55ba
1 parent 2bb3bb1
commit 22f55ba
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ TQGG:
 		src/PigInterface/*.f90 \
 		src/gridedit/*.f src/gridedit/*.f90 \
 		src/dataio/*.f src/dataio/*.f90 \
-		src/dataio/*.F90 \
+		src/netcdf/nullReadWriteCDF.f90 \
 		src/XMotif/*.f90
 	$(CC) $(C_FLAGS) -c src/XMotif/f90_c.h \
 		src/XMotif/XmMain.h src/XMotif/XmMain.c \
@@ -44,7 +44,7 @@ TQGGdbg:
 		src/PigInterface/*.f90 \
 		src/gridedit/*.f src/gridedit/*.f90 \
 		src/dataio/*.f src/dataio/*.f90 \
-		src/dataio/*.F90 \
+		src/netcdf/nullReadWriteCDF.f90 \
 		src/XMotif/*.f90
 	$(CC) $(CDBG_FLAGS) -c src/XMotif/f90_c.h \
 		src/XMotif/XmMain.h src/XMotif/XmMain.c \
@@ -53,14 +53,13 @@ TQGGdbg:
 	$(FC) *.o -o bin/TQGGdbg $(LIBS)
 
 TQGGnc:
-	$(FC) $(F_FLAGS) -c -DCNCD -I/usr/local/include \
+	$(FC) $(F_FLAGS) -c -I/usr/local/include \
 		src/dataio/MainArrays.f90 \
 		src/gridgen/*.f90 \
 		src/plotsubs/*.f90 \
 		src/PigInterface/*.f90 \
 		src/gridedit/*.f src/gridedit/*.f90 \
 		src/dataio/*.f src/dataio/*.f90 \
-		src/dataio/*.f src/dataio/*.F90 \
 		src/netcdf/UGrid_io_netCDF.f90 \
 		src/netcdf/ReadWriteCDF.f90 \
 		src/XMotif/*.f90
@@ -71,14 +70,13 @@ TQGGnc:
 	$(FC) *.o -o bin/TQGGnc -lnetcdff -lnetcdf $(LIBS)
 
 TQGGncdbg:
-	$(FC) $(FDBG_FLAGS) -c -DCNCD -I/usr/local/include \
+	$(FC) $(FDBG_FLAGS) -c -I/usr/local/include \
 		src/dataio/MainArrays.f90 \
 		src/gridgen/*.f90 \
 		src/plotsubs/*.f90 \
 		src/PigInterface/*.f90 \
 		src/gridedit/*.f src/gridedit/*.f90 \
 		src/dataio/*.f src/dataio/*.f90 \
-		src/dataio/*.f src/dataio/*.F90 \
 		src/netcdf/UGrid_io_netCDF.f90 \
 		src/netcdf/ReadWriteCDF.f90 \
 		src/XMotif/*.f90

diff --git a/Makefile-mac b/Makefile-mac
@@ -28,7 +28,7 @@ TQGG:
 		src/PigInterface/*.f90 \
 		src/gridedit/*.f src/gridedit/*.f90 \
 		src/dataio/*.f src/dataio/*.f90 \
-		src/dataio/*.F90 \
+		src/netcdf/nullReadWriteCDF.f90 \
 		src/XMotif/*.f90
 	$(CC) $(C_FLAGS) -c src/XMotif/f90_c.h \
 		src/XMotif/XmMain.h src/XMotif/XmMain.c \
@@ -44,7 +44,7 @@ TQGGdbg:
 		src/PigInterface/*.f90 \
 		src/gridedit/*.f src/gridedit/*.f90 \
 		src/dataio/*.f src/dataio/*.f90 \
-		src/dataio/*.F90 \
+		src/netcdf/nullReadWriteCDF.f90 \
 		src/XMotif/*.f90
 	$(CC) $(CDBG_FLAGS) -c src/XMotif/f90_c.h \
 		src/XMotif/XmMain.h src/XMotif/XmMain.c \
@@ -53,14 +53,13 @@ TQGGdbg:
 	$(FC) *.o -o bin/TQGGdbg $(LIBS)
 
 TQGGnc:
-	$(FC) $(F_FLAGS) -c -DCNCD -I/usr/local/include \
+	$(FC) $(F_FLAGS) -c -I/usr/local/include \
 		src/dataio/MainArrays.f90 \
 		src/gridgen/*.f90 \
 		src/plotsubs/*.f90 \
 		src/PigInterface/*.f90 \
 		src/gridedit/*.f src/gridedit/*.f90 \
 		src/dataio/*.f src/dataio/*.f90 \
-		src/dataio/*.f src/dataio/*.F90 \
 		src/netcdf/UGrid_io_netCDF.f90 \
 		src/netcdf/ReadWriteCDF.f90 \
 		src/XMotif/*.f90
@@ -71,14 +70,13 @@ TQGGnc:
 	$(FC) *.o -o bin/TQGGnc -lnetcdff -lnetcdf $(LIBS)
 
 TQGGncdbg:
-	$(FC) $(FDBG_FLAGS) -c -DCNCD -I/usr/local/include \
+	$(FC) $(FDBG_FLAGS) -c -I/usr/local/include \
 		src/dataio/MainArrays.f90 \
 		src/gridgen/*.f90 \
 		src/plotsubs/*.f90 \
 		src/PigInterface/*.f90 \
 		src/gridedit/*.f src/gridedit/*.f90 \
 		src/dataio/*.f src/dataio/*.f90 \
-		src/dataio/*.f src/dataio/*.F90 \
 		src/netcdf/UGrid_io_netCDF.f90 \
 		src/netcdf/ReadWriteCDF.f90 \
 		src/XMotif/*.f90

diff --git a/TQGGWS_vf/TQGG.sln → TQGGWS/VS2005/TQGG.sln b/TQGGWS_vf/TQGG.sln → TQGGWS/VS2005/TQGG.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "TQGG", "TQGG.vfproj", "{02227980-0698-4589-9C4D-D1D81894EDB2}"
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "TQGG", "TQGG.vfproj", "{A63BC396-47E9-49F3-AC74-024C5ECF4195}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,14 +11,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{02227980-0698-4589-9C4D-D1D81894EDB2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{02227980-0698-4589-9C4D-D1D81894EDB2}.Debug|Win32.Build.0 = Debug|Win32
-		{02227980-0698-4589-9C4D-D1D81894EDB2}.Debug|x64.ActiveCfg = Debug|x64
-		{02227980-0698-4589-9C4D-D1D81894EDB2}.Debug|x64.Build.0 = Debug|x64
-		{02227980-0698-4589-9C4D-D1D81894EDB2}.Release|Win32.ActiveCfg = Release|Win32
-		{02227980-0698-4589-9C4D-D1D81894EDB2}.Release|Win32.Build.0 = Release|Win32
-		{02227980-0698-4589-9C4D-D1D81894EDB2}.Release|x64.ActiveCfg = Release|x64
-		{02227980-0698-4589-9C4D-D1D81894EDB2}.Release|x64.Build.0 = Release|x64
+		{A63BC396-47E9-49F3-AC74-024C5ECF4195}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A63BC396-47E9-49F3-AC74-024C5ECF4195}.Debug|Win32.Build.0 = Debug|Win32
+		{A63BC396-47E9-49F3-AC74-024C5ECF4195}.Debug|x64.ActiveCfg = Debug|x64
+		{A63BC396-47E9-49F3-AC74-024C5ECF4195}.Debug|x64.Build.0 = Debug|x64
+		{A63BC396-47E9-49F3-AC74-024C5ECF4195}.Release|Win32.ActiveCfg = Release|Win32
+		{A63BC396-47E9-49F3-AC74-024C5ECF4195}.Release|Win32.Build.0 = Release|Win32
+		{A63BC396-47E9-49F3-AC74-024C5ECF4195}.Release|x64.ActiveCfg = Release|x64
+		{A63BC396-47E9-49F3-AC74-024C5ECF4195}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/TQGGWS_vf/TQGG.vfproj → TQGGWS/VS2005/TQGG.vfproj b/TQGGWS_vf/TQGG.vfproj → TQGGWS/VS2005/TQGG.vfproj
@@ -91,7 +91,9 @@
 		<File RelativePath="..\..\src\gridedit\sortit.f"/>
 		<File RelativePath="..\..\src\gridedit\StraightLine.f"/>
 		<File RelativePath="..\..\src\dataio\Stspl.f"/>
-		<File RelativePath="..\..\src\dataio\stspldf.f"/>
+		<File RelativePath="..\..\src\dataio\stspldf.f">
+			<FileConfiguration Name="Debug|Win32">
+				<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
 		<File RelativePath="..\..\src\dataio\WriteData.f90"/>
 		<File RelativePath="..\..\src\dataio\Xsection.f90"/></Filter></Files>
 	<Globals/></VisualStudioProject>
diff --git a/docs/installation.pdf b/docs/installation.pdf
diff --git a/docs/tex/installation.tex b/docs/tex/installation.tex
@@ -120,7 +120,7 @@ \subsection{System Requirements}
 automatically updated to a new format.
 
 \subsection{Building}
-The project file TQGG.vfproj can be found in './TQGGWS\_vf'. Open this file in Visual Studio
+The project file TQGG.vfproj can be found in './TQGGWS/VS2005'. Open this file in Visual Studio
 and there will be options to build the 32-bit debug and release versions, and the 64-bit debug 
 and release versions.
 

diff --git a/src/dataio/ReadData.F90 → src/dataio/ReadData.f90 b/src/dataio/ReadData.F90 → src/dataio/ReadData.f90
@@ -89,14 +89,7 @@ SUBROUTINE OpenGridFile( Quit )
 !          istat = index( fle, '.nc' )
           if(fle(fnlen-2:fnlen).eq.'.nc') then !netCDF file
             close(nunit,status='keep')
-#ifdef CNCD
             call ReadnetCDFData(fle,Quit)
-#else
-            call PigMessageOK('Recompile with netCDF option','ReadnCDF')
-            Quit = .TRUE.
-            GridRName =  'NONE'
-            return
-#endif
           elseif(fle(fnlen-3:fnlen).eq.'.ngh') then !ngh file
 !            open(nunit,file=fle,status='old')
             READ(nunit,'(a)',IOSTAT=istat) Firstline

diff --git a/src/dataio/WriteData.F90 → src/dataio/WriteData.f90 b/src/dataio/WriteData.F90 → src/dataio/WriteData.f90
@@ -184,11 +184,7 @@ SUBROUTINE SaveFinal( change, Quit )
           change = .false.
         endif
         close(nunit,status='keep')
-#ifdef CNCD
         call WritenetCDFData(ans,Quit)
-#else
-        call PigMessageOK('Recompile with netCDF option','WritenCDF')
-#endif
       elseif(ans(fnlen-3:fnlen).eq.'.grd') then !grd file, nodes+elements
         write(*,*) fnlen-3,fnlen
         write(*,*) ans(fnlen-3:fnlen)

diff --git a/src/netcdf/nullReadWriteCDF.f90 b/src/netcdf/nullReadWriteCDF.f90
@@ -0,0 +1,35 @@
+!*********************************************************************  
+
+      subroutine ReadnetCDFData(fname,Quit)
+
+      implicit none
+
+      INCLUDE '../includes/defaults.inc'
+
+! *** passed varaibles
+      character(len=*) :: fname
+      logical quit
+
+      Quit = .TRUE.
+      GridRName =  'NONE'
+      fname = 'NONE'
+      call PigMessageOK('Recompile with netCDF option','ReadnetCDF')
+
+      end subroutine
+
+!*********************************************************************  
+
+      subroutine WritenetCDFData(fname,Quit)
+
+      implicit none
+
+! *** passed varaibles
+      character(len=*) :: fname
+      logical quit
+
+      Quit = .TRUE.
+      call PigMessageOK('Recompile with netCDF option','WritenetCDF')
+      fname = 'NONE'
+      end subroutine
+
+!************************************************************************