max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tested all phast3 configurations on ex4.

Browse Source 
Changed default logic to write xyz only for count_chem cells.
   If NEW_STYLE_XYZ is defined, then xyz file contains nxyz cells.

write2_2.f90 changed to USE IPhreeqc
write5.f90 changed to USE IPhreeqc

TestRM advection_f90.F90 changed to USE IPhreeqc
TestRM species_f90.F90 changed to USE IPhreeqc

FortranAdvect.vfproj: IPhreeqc.f90.inc removed and IPhreeqc_interface.F90 added.

PhreeqcRM.vcxproj, PhreeqcRM.vcxproj.filters: fwrap files removed and IPhreeqc_interface_F.cpp added

phast3.vcxproj: added or corrected postbuild copy of zlib1, hdf5dll, and szlibdll.dll.
   removed OLD_STYLE_XYZ (logically it is now the default for xyz file).
   removed dead preprocessor definitions PHREEQC_CPP, MERGE_FILES, GZIP_RESTART, OMPI_IMPORTS

phastf.vfproj: removed IPhreeqc.f90.inc added IPhreeqc_interface.F90.

fwrap files are compiled if #ifdef IPHREEQC_NO_FORTRAN_MODULE

IPhreeqc_interface.F90 compiled if #ifndef IPHREEQC_NO_FORTRAN_MODULE
   fixed bug intent(inout) should have been intent(in) (constant character argument).
   fixed interfaces for SetBasicFortranCallback

IPhreeqc_interface_F.cpp compiled if #ifndef IPHREEQC_NO_FORTRAN_MODULE

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9356 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-03-13 16:40:25 +00:00
parent 8f6dd6f405
commit 8f85adcf3b
12 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
IPhreeqc_interface.F90
View File

@ -1,4 +1,4 @@
#ifdef IPHREEQC_MODULE
#ifndef IPHREEQC_NO_FORTRAN_MODULE
MODULE IPhreeqc
implicit none
SAVE
@ -685,7 +685,7 @@ INTEGER FUNCTION LoadDatabase(id, filename)
END FUNCTION LoadDatabaseF
END INTERFACE
INTEGER, INTENT(in) :: id
CHARACTER(len=*), INTENT(inout) :: filename
CHARACTER(len=*), INTENT(in) :: filename
LoadDatabase = LoadDatabaseF(id, trim(filename)//C_NULL_CHAR)
return
END FUNCTION LoadDatabase
@ -702,7 +702,7 @@ INTEGER FUNCTION LoadDatabaseString(id, input)
END FUNCTION LoadDatabaseStringF
END INTERFACE
INTEGER, INTENT(in) :: id
CHARACTER(len=*), INTENT(inout) :: input
CHARACTER(len=*), INTENT(in) :: input
LoadDatabaseString = LoadDatabaseStringF(id, trim(input)//C_NULL_CHAR)
return
END FUNCTION LoadDatabaseString
@ -779,7 +779,7 @@ INTEGER FUNCTION RunFile(id, filename)
END FUNCTION RunFileF
END INTERFACE
INTEGER, INTENT(in) :: id
CHARACTER(len=*), INTENT(inout) :: filename
CHARACTER(len=*), INTENT(in) :: filename
RunFile = RunFileF(id, trim(filename)//C_NULL_CHAR)
return
END FUNCTION RunFile
@ -796,7 +796,7 @@ INTEGER FUNCTION RunString(id, input)
END FUNCTION RunStringF
END INTERFACE
INTEGER, INTENT(in) :: id
CHARACTER(len=*), INTENT(inout) :: input
CHARACTER(len=*), INTENT(in) :: input
RunString = RunStringF(id, trim(input)//C_NULL_CHAR)
return
END FUNCTION RunString
@ -810,22 +810,22 @@ INTEGER FUNCTION SetBasicFortranCallback(id, fcn)
IMPLICIT NONE
INTEGER(KIND=C_INT), INTENT(in) :: id
INTERFACE
INTEGER(KIND=C_INT) FUNCTION fcn(x1, x2, str, l) BIND(C)
REAL(KIND=C_DOUBLE) FUNCTION fcn(x1, x2, str, l) BIND(C)
USE ISO_C_BINDING
INTEGER(KIND=C_INT), INTENT(inout) :: l
REAL(KIND=C_DOUBLE), INTENT(inout) :: x1, x2
CHARACTER(KIND=C_CHAR), INTENT(out) :: str(*)
INTEGER(KIND=C_INT), INTENT(in) :: l
REAL(KIND=C_DOUBLE), INTENT(in) :: x1, x2
CHARACTER(KIND=C_CHAR), INTENT(in) :: str(*)
END FUNCTION fcn
END INTERFACE
END FUNCTION SetBasicFortranCallbackF
END INTERFACE
INTEGER, INTENT(in) :: id
INTERFACE
INTEGER(KIND=C_INT) FUNCTION fcn(x1, x2, str, l) BIND(C)
REAL(KIND=C_DOUBLE) FUNCTION fcn(x1, x2, str, l) BIND(C)
USE ISO_C_BINDING
INTEGER(KIND=C_INT), INTENT(inout) :: l
REAL(KIND=C_DOUBLE), INTENT(inout) :: x1, x2
CHARACTER(KIND=C_CHAR), INTENT(out) :: str(*)
INTEGER(KIND=C_INT), INTENT(in) :: l
REAL(KIND=C_DOUBLE), INTENT(in) :: x1, x2
CHARACTER(KIND=C_CHAR), INTENT(in) :: str(*)
END FUNCTION fcn
END INTERFACE
SetBasicFortranCallback = SetBasicFortranCallbackF(id, fcn)

2
IPhreeqc_interface_F.cpp
View File

@ -1,4 +1,4 @@
#ifdef IPHREEQC_MODULE
#ifndef IPHREEQC_NO_FORTRAN_MODULE
#include <ctype.h> /* isgraph */
#include <stdlib.h> /* malloc */
#include <memory.h> /* memcpy */

2
fwrap.cpp
View File

@ -1,5 +1,5 @@
#ifndef IPHREEQC_MODULE
#ifdef IPHREEQC_NO_FORTRAN_MODULE
#include <ctype.h> /* isgraph */
#include <stdlib.h> /* malloc */
#include <memory.h> /* memcpy */

2
fwrap.h
View File

@ -1,4 +1,4 @@
#ifndef IPHREEQC_MODULE
#ifdef IPHREEQC_NO_FORTRAN_MODULE
#ifndef __FWRAP__H
#define __FWRAP__H

2
fwrap1.cpp
View File

@ -1,3 +1,4 @@
#ifdef NO_IPHREEQC_FORTRAN_MODULE
#include "IPhreeqc.h"
#include "fwrap.h"
@ -19,4 +20,5 @@ extern "C" {
}
#endif
#endif
#endif

2
fwrap2.cpp
View File

@ -1,4 +1,4 @@
#ifndef IPHREEQC_MODULE
#ifdef IPHREEQC_NO_FORTRAN_MODULE
#include "IPhreeqc.h"
#include "fwrap.h"

2
fwrap3.cpp
View File

@ -1,4 +1,4 @@
#ifndef IPHREEQC_MODULE
#ifdef IPHREEQC_NO_FORTRAN_MODULE
#include "IPhreeqc.h"
#include "fwrap.h"

2
fwrap4.cpp
View File

@ -1,4 +1,4 @@
#ifndef IPHREEQC_MODULE
#ifdef IPHREEQC_NO_FORTRAN_MODULE
#include "IPhreeqc.h"
#include "fwrap.h"

2
fwrap5.cpp
View File

@ -1,4 +1,4 @@
#ifndef IPHREEQC_MODULE
#ifdef IPHREEQC_NO_FORTRAN_MODULE
#include "IPhreeqc.h"
#include "fwrap.h"

2
fwrap6.cpp
View File

@ -1,4 +1,4 @@
#ifndef IPHREEQC_MODULE
#ifdef IPHREEQC_NO_FORTRAN_MODULE
#include "IPhreeqc.h"
#include "fwrap.h"

2
fwrap7.cpp
View File

@ -1,4 +1,4 @@
#ifndef IPHREEQC_MODULE
#ifdef IPHREEQC_NO_FORTRAN_MODULE
#include "IPhreeqc.h"
#include "fwrap.h"

2
fwrap8.cpp
View File

@ -1,4 +1,4 @@
#ifndef IPHREEQC_MODULE
#ifdef IPHREEQC_NO_FORTRAN_MODULE
#include "IPhreeqc.h"
#include "fwrap.h"