Merge branch 'dev'

.gitignore

@@ -30,3 +30,25 @@ build/bin/RELEASE/MOHIDLagrangian.exe
 src/MOHIDLagrangianLib/kernel.f90
 src/MOHIDLagrangianLib/kernelColiforms.f90
 build/bin/RELEASE/MOHIDLagrangian.exe
+build/bin/RELEASE/MOHIDLagrangian.exe
+RUN_Cases/Debug_case/Command Prompt.lnk
+RUN_Cases/Debug_case/data/Batea.kmz
+RUN_Cases/Debug_case/data/Lerez.dat
+RUN_Cases/Debug_case/data/Minor.dat
+RUN_Cases/Debug_case/data/source_box2.kmz
+RUN_Cases/Debug_case/data/spill_trajectory.dat
+RUN_Cases/Debug_case/data/Verdugo.dat
+RUN_Cases/Debug_case/materialTypes.xml
+RUN_Cases/Debug_case/Debug_case.xml
+RUN_Cases/Debug_case/nc_fields/hydrodynamic/2022053100.nc
+RUN_Cases/Debug_case/nc_fields/hydrodynamic/2022060100.nc
+RUN_Cases/Debug_case/nc_fields/hydrodynamic/2022060200.nc
+RUN_Cases/Debug_case/nc_fields/meteo/2022053100.nc
+RUN_Cases/Debug_case/nc_fields/meteo/2022060100.nc
+RUN_Cases/Debug_case/nc_fields/meteo/2022060200.nc
+RUN_Cases/Debug_case/ncNamesLibrary.xml
+RUN_Cases/Debug_case/outputFields.xml
+RUN_Cases/Debug_case/PV_state.pvsm
+RUN_Cases/Debug_case/RunCase_buoyancy.sh
+RUN_Cases/Debug_case/RunCase_test.bat
+build/bin/RELEASE/MOHIDLagrangian.exe

ExternalLibs/MOHID/MOHIDBase1/ModuleWaterQuality.F90

@@ -503,7 +503,7 @@ Module ModuleWaterQuality
         real :: PON_CNratio                                 = null_real
         real :: PON_CPratio                                 = null_real
 
-
+        logical :: MohidLagr                                = .false.
 
         !aqui_10
         integer                                     :: WQConfiguration =0
@@ -541,12 +541,13 @@ Module ModuleWaterQuality
     !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 
-    subroutine StartWaterQuality(WaterQualityID, FileName, STAT)
+    subroutine StartWaterQuality(WaterQualityID, FileName, STAT, MohidLagr)
 
         !Arguments-------------------------------------------------------------
         integer                         :: WaterQualityID
         character(LEN = *)              :: FileName    
-        integer, optional, intent(OUT)  :: STAT     
+        integer, optional, intent(OUT)  :: STAT
+        logical, optional, intent(IN)   :: MohidLagr
 
         !External--------------------------------------------------------------
         integer                         :: STAT_CALL
@@ -558,16 +559,25 @@ subroutine StartWaterQuality(WaterQualityID, FileName, STAT)
         !----------------------------------------------------------------------
 
         STAT_ = UNKNOWN_
-
-        !Assures nullification of the global variable
-        if (.not. ModuleIsRegistered(mWaterQuality_)) then
-            nullify (FirstObjWaterQuality)
-            call RegisterModule (mWaterQuality_) 
+        if (present(MohidLagr)) then
+            Me%MohidLagr = MohidLagr
+        else
+            Me%MohidLagr = .false.
         endif
 
-        call Ready(WaterQualityID, ready_)    
+        if (.not. MohidLagr) then
+            !Standard MOHID simulation allocating modules. If MOHIDLagrangian model calls this module, use it only as
+            !a system of functions and not inserted in the modules system.
+            !Assures nullification of the global variable
+            if (.not. ModuleIsRegistered(mWaterQuality_)) then
+                nullify (FirstObjWaterQuality)
+                call RegisterModule (mWaterQuality_) 
+            endif
+        endif
+
+        call Ready(WaterQualityID, ready_)
 
-cd0 :   if (ready_ .EQ. OFF_ERR_) then
+cd0 :   if (ready_ .EQ. OFF_ERR_ .OR. Me%MohidLagr) then
 
             call AllocateInstance           
 
@@ -4362,7 +4372,8 @@ subroutine GetDTWQM(WaterQualityID, DTDay, DTSecond, STAT)
         call Ready(WaterQualityID, ready_)    
 
 cd1 :   if ((ready_ .EQ. IDLE_ERR_     ) .OR.                                 &
-            (ready_ .EQ. READ_LOCK_ERR_)) then
+            (ready_ .EQ. READ_LOCK_ERR_) .OR.                                 &
+            (Me%MohidLagr)) then
 
             if (present(DTDay   )) DTDay    = Me%DTDay
             if (present(DTSecond)) DTSecond = Me%DTSecond
@@ -4634,7 +4645,7 @@ subroutine WaterQuality(WaterQualityID,                                     &
 
         call Ready(WaterQualityID, ready_)    
 
-cd1 :   if (ready_ .EQ. IDLE_ERR_) then
+cd1 :   if (ready_ .EQ. IDLE_ERR_ .OR. Me%MohidLagr) then
 
             Me%ExternalVar%Salinity                   => Salinity
             if (.NOT. associated(Me%ExternalVar%Salinity))         &
@@ -9042,7 +9053,7 @@ subroutine KillWaterQuality(WaterQualityID, STAT)
 
         call Ready(WaterQualityID, ready_)    
 
-cd1 :   if (ready_ .NE. OFF_ERR_) then
+cd1 :   if (ready_ .NE. OFF_ERR_ .OR. Me%MohidLagr) then
 
             nUsers = DeassociateInstance(mWATERQUALITY_,  Me%InstanceID)
 

ExternalLibs/MOHID/RunCmake.bat

@@ -15,3 +15,4 @@ cmake .. -DCMAKE_GENERATOR_PLATFORM=x64 -DCMAKE_BUILD_TYPE="RELEASE" -Wno-dev
 cd ..
 if not "%ERRORLEVEL%" == "0" goto fail
 
+pause

ExternalLibs/MOHID/build/ALL_BUILD.vcxproj.filters

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="C:\Users\RBC_workhorse\Documents\GitHub\MOHID-Lagrangian\ExternalLibs\MOHID\CMakeLists.txt" />
+    <CustomBuild Include="C:\Users\Admin\Documents\GitHub\Maretec\MOHID-Lagrangian\ExternalLibs\MOHID\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>

ExternalLibs/MOHID/build/ALL_BUILD.vcxproj.user

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup />
 </Project>

ExternalLibs/MOHID/build/CMakeCache.txt

@@ -1,5 +1,5 @@
 # This is the CMakeCache file.
-# For build in directory: c:/Users/RBC_workhorse/Documents/GitHub/MOHID-Lagrangian/ExternalLibs/MOHID/build
+# For build in directory: c:/Users/Admin/Documents/GitHub/Maretec/MOHID-Lagrangian/ExternalLibs/MOHID/build
 # It was generated by CMake: C:/Program Files/CMake/bin/cmake.exe
 # You can edit this file to change values found and used by cmake.
 # If you do not want to change any of the values, simply exit the editor.
@@ -14,8 +14,11 @@
 # EXTERNAL cache entries
 ########################
 
+//Path to a program.
+CMAKE_AR:FILEPATH=CMAKE_AR-NOTFOUND
+
 //No help, variable specified on the command line.
-CMAKE_BUILD_TYPE:UNINITIALIZED=DEBUG
+CMAKE_BUILD_TYPE:UNINITIALIZED=RELEASE
 
 //Semicolon separated list of supported configuration types, only
 // supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything
@@ -81,17 +84,26 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
 // RELWITHDEBINFO builds.
 CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
 
+//Path to a program.
+CMAKE_MT:FILEPATH=CMAKE_MT-NOTFOUND
+
+//Value Computed by CMake
+CMAKE_PROJECT_DESCRIPTION:STATIC=
+
+//Value Computed by CMake
+CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
+
 //Value Computed by CMake
 CMAKE_PROJECT_NAME:STATIC=MOHIDBases
 
 //RC compiler
 CMAKE_RC_COMPILER:FILEPATH=rc
 
 //Flags for Windows Resource Compiler during all build types.
-CMAKE_RC_FLAGS:STRING=/DWIN32
+CMAKE_RC_FLAGS:STRING=-DWIN32
 
 //Flags for Windows Resource Compiler during DEBUG builds.
-CMAKE_RC_FLAGS_DEBUG:STRING=/D_DEBUG
+CMAKE_RC_FLAGS_DEBUG:STRING=-D_DEBUG
 
 //Flags for Windows Resource Compiler during MINSIZEREL builds.
 CMAKE_RC_FLAGS_MINSIZEREL:STRING=
@@ -156,27 +168,27 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
 CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
 
 //Dependencies for the target
-MOHIDBase1_LIB_DEPENDS:STATIC=general;C:/Users/RBC_workhorse/Documents/GitHub/MOHID-Lagrangian/ExternalLibs/Netcdf_4.4.1.1/VS2015/x64/netcdf.lib;general;C:/Users/RBC_workhorse/Documents/GitHub/MOHID-Lagrangian/ExternalLibs/Netcdf_4.4.1.1/VS2015/x64/netcdff.lib;
+MOHIDBase1_LIB_DEPENDS:STATIC=general;C:/Users/Admin/Documents/GitHub/Maretec/MOHID-Lagrangian/ExternalLibs/Netcdf_4.4.1.1/VS2015/x64/netcdf.lib;general;C:/Users/Admin/Documents/GitHub/Maretec/MOHID-Lagrangian/ExternalLibs/Netcdf_4.4.1.1/VS2015/x64/netcdff.lib;
 
 //Value Computed by CMake
-MOHIDBases_BINARY_DIR:STATIC=C:/Users/RBC_workhorse/Documents/GitHub/MOHID-Lagrangian/ExternalLibs/MOHID/build
+MOHIDBases_BINARY_DIR:STATIC=C:/Users/Admin/Documents/GitHub/Maretec/MOHID-Lagrangian/ExternalLibs/MOHID/build
 
 //Value Computed by CMake
-MOHIDBases_SOURCE_DIR:STATIC=C:/Users/RBC_workhorse/Documents/GitHub/MOHID-Lagrangian/ExternalLibs/MOHID
+MOHIDBases_SOURCE_DIR:STATIC=C:/Users/Admin/Documents/GitHub/Maretec/MOHID-Lagrangian/ExternalLibs/MOHID
 
 
 ########################
 # INTERNAL cache entries
 ########################
 
 //This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/RBC_workhorse/Documents/GitHub/MOHID-Lagrangian/ExternalLibs/MOHID/build
+CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/Admin/Documents/GitHub/Maretec/MOHID-Lagrangian/ExternalLibs/MOHID/build
 //Major version of cmake used to create the current loaded cache
 CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
 //Minor version of cmake used to create the current loaded cache
-CMAKE_CACHE_MINOR_VERSION:INTERNAL=12
+CMAKE_CACHE_MINOR_VERSION:INTERNAL=18
 //Patch version of cmake used to create the current loaded cache
-CMAKE_CACHE_PATCH_VERSION:INTERNAL=3
+CMAKE_CACHE_PATCH_VERSION:INTERNAL=4
 //Path to CMake executable.
 CMAKE_COMMAND:INTERNAL=C:/Program Files/CMake/bin/cmake.exe
 //Path to cpack program executable.
@@ -212,14 +224,14 @@ CMAKE_Fortran_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_Fortran_STANDARD_LIBRARIES
 CMAKE_Fortran_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1
 //Name of generator.
-CMAKE_GENERATOR:INTERNAL=Visual Studio 15 2017
+CMAKE_GENERATOR:INTERNAL=Visual Studio 16 2019
 //Generator instance identifier.
-CMAKE_GENERATOR_INSTANCE:INTERNAL=C:/Program Files (x86)/Microsoft Visual Studio/2017/Community
+CMAKE_GENERATOR_INSTANCE:INTERNAL=C:/Program Files (x86)/Microsoft Visual Studio/2019/Community
 //Name of generator toolset.
 CMAKE_GENERATOR_TOOLSET:INTERNAL=
 //Source directory with the top level CMakeLists.txt file for this
 // project
-CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/RBC_workhorse/Documents/GitHub/MOHID-Lagrangian/ExternalLibs/MOHID
+CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/Admin/Documents/GitHub/Maretec/MOHID-Lagrangian/ExternalLibs/MOHID
 //ADVANCED property for variable: CMAKE_LINKER
 CMAKE_LINKER-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
@@ -232,6 +244,8 @@ CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
 CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
 CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MT
+CMAKE_MT-ADVANCED:INTERNAL=1
 //number of local generators
 CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=3
 //Platform information initialized
@@ -250,7 +264,7 @@ CMAKE_RC_FLAGS_RELEASE-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_RC_FLAGS_RELWITHDEBINFO
 CMAKE_RC_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
 //Path to CMake installation.
-CMAKE_ROOT:INTERNAL=C:/Program Files/CMake/share/cmake-3.12
+CMAKE_ROOT:INTERNAL=C:/Program Files/CMake/share/cmake-3.18
 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
 CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG