# IPQ_DLL_EXPORT int GetDumpOn(int id);

# IPQ_DLL_EXPORT int GetDumpFileOn(int id); # IPQ_DLL_EXPORT IPQ_RESULT SetDumpOn(int id, int dump_on); # IPQ_DLL_EXPORT IPQ_RESULT SetDumpFileOn(int id, int dump_on); s/etDumpOn/etDumpFileOn/g s/etdumpon/etdumpfileon/g s/ETDUMPON/ETDUMPFILEON/g # IPQ_DLL_EXPORT int GetErrorOn(int id); # IPQ_DLL_EXPORT int GetErrorFileOn(int id); # IPQ_DLL_EXPORT IPQ_RESULT SetErrorOn(int id, int error_on); # IPQ_DLL_EXPORT IPQ_RESULT SetErrorFileOn(int id, int error_on); s/etErrorOn/etErrorFileOn/g s/eterroron/eterrorfileon/g s/ETERRORON/ETERRORFILEON/g # IPQ_DLL_EXPORT int GetLogOn(int id); # IPQ_DLL_EXPORT int GetLogFileOn(int id); # IPQ_DLL_EXPORT IPQ_RESULT SetLogOn(int id, int log_on); # IPQ_DLL_EXPORT IPQ_RESULT SetLogFileOn(int id, int log_on); s/etLogOn/etLogFileOn/g s/etlogon/etlogfileon/g s/ETLOGON/ETLOGFILEON/g # IPQ_DLL_EXPORT int GetOutputOn(int id); # IPQ_DLL_EXPORT int GetOutputFileOn(int id); # IPQ_DLL_EXPORT IPQ_RESULT SetOutputOn(int id, int output_on); # IPQ_DLL_EXPORT IPQ_RESULT SetOutputFileOn(int id, int output_on); s/etOutputOn/etOutputFileOn/g s/etoutputon/etoutputfileon/g s/ETOUTPUTON/ETOUTPUTFILEON/g # IPQ_DLL_EXPORT int GetSelectedOutputOn(int id); # IPQ_DLL_EXPORT int GetSelectedOutputFileOn(int id); # IPQ_DLL_EXPORT IPQ_RESULT SetSelectedOutputOn(int id, int sel_on); # IPQ_DLL_EXPORT IPQ_RESULT SetSelectedOutputFileOn(int id, int sel_on); s/etSelectedOutputOn/etSelectedOutputFileOn/g s/etselectedoutputon/etselectedoutputfileon/g s/ETSELECTEDOUTPUTON/ETSELECTEDOUTPUTFILEON/g # IPQ_DLL_EXPORT const char* GetDumpLine(int id, int n); # IPQ_DLL_EXPORT const char* GetDumpStringLine(int id, int n); # IPQ_DLL_EXPORT int GetDumpLineCount(int id); # IPQ_DLL_EXPORT int GetDumpStringLineCount(int id); s/GetDumpLine/GetDumpStringLine/g s/getdumpline/getdumpstringline/g s/GETDUMPLINE/GETDUMPSTRINGLINE/g # IPQ_DLL_EXPORT const char* GetErrorLine(int id, int n); # IPQ_DLL_EXPORT const char* GetErrorStringLine(int id, int n); # IPQ_DLL_EXPORT int GetErrorLineCount(int id); # IPQ_DLL_EXPORT int GetErrorStringLineCount(int id); s/GetErrorLine/GetErrorStringLine/g s/geterrorline/geterrorstringline/g s/GETERRORLINE/GETERRORSTRINGLINE/g # IPQ_DLL_EXPORT const char* GetWarningLine(int id, int n); # IPQ_DLL_EXPORT const char* GetWarningStringLine(int id, int n); # IPQ_DLL_EXPORT int GetWarningLineCount(int id); # IPQ_DLL_EXPORT int GetWarningStringLineCount(int id); s/GetWarningLine/GetWarningStringLine/g s/getwarningline/getwarningstringline/g s/GETWARNINGLINE/GETWARNINGSTRINGLINE/g # IPQ_DLL_EXPORT void OutputError(int id); # IPQ_DLL_EXPORT void OutputErrorString(int id); s/OutputError/OutputErrorString/g s/outputerror/outputerrorstring/g s/OUTPUTERROR/OUTPUTERRORSTRING/g # IPQ_DLL_EXPORT void OutputLines(int id); # IPQ_DLL_EXPORT void OutputAccumulatedLines(int id); s/OutputLines/OutputAccumulatedLines/g s/outputlines/outputaccumulatedlines/g s/OUTPUTLINES/OUTPUTACCUMULATEDLINES/g # IPQ_DLL_EXPORT void OutputWarning(int id); # IPQ_DLL_EXPORT void OutputWarningString(int id); s/OutputWarning/OutputWarningString/g s/outputwarning/outputwarningstring/g s/OUTPUTWARNING/OUTPUTWARNINGSTRING/g git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4412 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2025-12-15 16:18:22 +01:00 · 2010-05-18 03:17:39 +00:00 · 2010-05-18 03:17:39 +00:00 · 12ac80f2a7
commit 12ac80f2a7
parent 2c4422593b
10 changed files with 50 additions and 50 deletions
--- a/doc/examples/AccumulateLine.c
+++ b/doc/examples/AccumulateLine.c
@ -11,27 +11,27 @@ int main(void)
  }
  
  if (LoadDatabase(id, "phreeqc.dat") != 0) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }

  if (AccumulateLine(id, "SOLUTION 1") != IPQ_OK) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }

  if (AccumulateLine(id, "END") != IPQ_OK) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }
  
  if (RunAccumulated(id) != 0) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }
  
  if (DestroyIPhreeqc(id) != IPQ_OK) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }
  
--- a/doc/examples/CreateIPhreeqc.c
+++ b/doc/examples/CreateIPhreeqc.c
@ -11,17 +11,17 @@ int main(void)
  }
  
  if (LoadDatabase(id, "phreeqc.dat") != 0) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }

  if (RunFile(id, "ex2") != 0) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }
  
  if (DestroyIPhreeqc(id) != IPQ_OK) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }
  
--- a/doc/examples/F90ClearAccumulatedLines.f90
+++ b/doc/examples/F90ClearAccumulatedLines.f90
@ -9,40 +9,40 @@ PROGRAM example
  ENDIF
  
  IF (LoadDatabase(id, "../../database/wateq4f.dat").NE.0) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
  
  IF (AccumulateLine(id, "SOLUTION 1").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
  
  IF (AccumulateLine(id, "pH -2").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
  
  IF (AccumulateLine(id, "END").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
  
  IF (RunAccumulated(id).NE.0) THEN
-     CALL OutputLines(id)
-     CALL OutputError(id)
+     CALL OutputAccumulatedLines(id)
+     CALL OutputErrorString(id)
     IF (AccumulateLine(id, "SOLUTION 1").NE.IPQ_OK) THEN
-        CALL OutputError(id)
+        CALL OutputErrorString(id)
        STOP
     ENDIF
     
     IF (AccumulateLine(id, "pH 2").NE.IPQ_OK) THEN
-        CALL OutputError(id)
+        CALL OutputErrorString(id)
        STOP
     ENDIF
     
     IF (AccumulateLine(id, "END").NE.IPQ_OK) THEN
-        CALL OutputError(id)
+        CALL OutputErrorString(id)
        STOP
     ENDIF
     
@ -52,7 +52,7 @@ PROGRAM example
  ENDIF
  
  IF (DestroyIPhreeqc(id).NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
  WRITE(*,*) "Ok"
--- a/doc/examples/F90CreateIPhreeqc.f90
+++ b/doc/examples/F90CreateIPhreeqc.f90
@ -8,17 +8,17 @@ PROGRAM example
  ENDIF
  
  IF (LoadDatabase(id, "phreeqc.dat").NE.0) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
  
  IF (RunFile(id, "ex2").NE.0) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  IF (DestroyIPhreeqc(id).NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
  
--- a/doc/examples/F90DestroyIPhreeqc.f90
+++ b/doc/examples/F90DestroyIPhreeqc.f90
@ -8,7 +8,7 @@ PROGRAM example
  ENDIF
  
  IF (DestroyIPhreeqc(id).NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
  
--- a/doc/examples/F90GetComponent.f90
+++ b/doc/examples/F90GetComponent.f90
@ -10,12 +10,12 @@ PROGRAM example
  ENDIF
  
  IF (LoadDatabase(id, "phreeqc.dat").NE.0) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
  
  IF (RunFile(id, "ex2").NE.0) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
  
@ -25,7 +25,7 @@ PROGRAM example
  ENDDO
  
  IF (DestroyIPhreeqc(id).NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
 END PROGRAM example
--- a/doc/examples/F90GetDumpLine.f90
+++ b/doc/examples/F90GetDumpLine.f90
@ -10,71 +10,71 @@ PROGRAM example
  ENDIF

  IF (SetDumpStringOn(id, .TRUE.).NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  IF (LoadDatabase(id, "phreeqc.dat").NE.0) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  IF (AccumulateLine(id, "SOLUTION 1 Pure water").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  IF (AccumulateLine(id, "EQUILIBRIUM_PHASES 1").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  IF (AccumulateLine(id, "    Calcite 0 10").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  IF (AccumulateLine(id, "SAVE solution 1").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  IF (AccumulateLine(id, "SAVE equilibrium_phases 1").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  IF (AccumulateLine(id, "DUMP").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  IF (AccumulateLine(id, "    -solution 1").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  IF (AccumulateLine(id, "    -equilibrium_phases 1").NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  WRITE(*,*) "Input:"
-  CALL OutputLines(id)
+  CALL OutputAccumulatedLines(id)

  IF (RunAccumulated(id).NE.0) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF

  WRITE(*,*) "Dump:"
-  DO i=1,GetDumpLineCount(id)
-     CALL GetDumpLine(id, i, line)
+  DO i=1,GetDumpStringLineCount(id)
+     CALL GetDumpStringLine(id, i, line)
     WRITE(*,*) TRIM(line)
  ENDDO

  IF (DestroyIPhreeqc(id).NE.IPQ_OK) THEN
-     CALL OutputError(id)
+     CALL OutputErrorString(id)
     STOP
  ENDIF
 END PROGRAM example
--- a/doc/examples/GetComponent.c
+++ b/doc/examples/GetComponent.c
@ -12,12 +12,12 @@ int main(void)
  }
  
  if (LoadDatabase(id, "phreeqc.dat") != 0) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }
  
  if (RunFile(id, "ex2") != 0) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }
  
@ -26,7 +26,7 @@ int main(void)
  }
  
  if (DestroyIPhreeqc(id) != IPQ_OK) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }
  
--- a/doc/examples/GetDumpString.c
+++ b/doc/examples/GetDumpString.c
@ -24,17 +24,17 @@ int main(void)
  }

  if (LoadDatabase(id, "phreeqc.dat") != 0) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }

  if (SetDumpStringOn(id, TRUE) != IPQ_OK) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }

  if (RunString(id, input) != 0) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }

@ -42,7 +42,7 @@ int main(void)
  printf("%s\n", GetDumpString(id));

  if (DestroyIPhreeqc(id) != IPQ_OK) {
-    OutputError(id);
+    OutputErrorString(id);
    return EXIT_FAILURE;
  }

--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@ -21,7 +21,7 @@ TARGETS = \
 F90_TARGETS = \
 	F90CreateIPhreeqc \
 	F90GetComponent \
-	F90GetDumpLine \
+	F90GetDumpStringLine \
 	F90ClearAccumulatedLines


@ -49,7 +49,7 @@ F90CreateIPhreeqc: F90CreateIPhreeqc.lo $(IPHREEQC_LA)
 F90GetComponent: F90GetComponent.lo $(IPHREEQC_LA)
 	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS)
 	
-F90GetDumpLine: F90GetDumpLine.lo $(IPHREEQC_LA)
+F90GetDumpStringLine: F90GetDumpStringLine.lo $(IPHREEQC_LA)
 	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS)

 F90ClearAccumulatedLines: F90ClearAccumulatedLines.lo $(IPHREEQC_LA)
@ -83,7 +83,7 @@ F90_LO_FILES = \
 	F90CreateIPhreeqc.lo \
 	F90DestroyIPhreeqc.lo \
 	F90GetComponent.lo \
-	F90GetDumpLine.lo
+	F90GetDumpStringLine.lo
 	

 clean: