Efdc mpi

core/native/build_visual_studio/opendabridge/opendabridge.vcxproj

@@ -32,28 +32,28 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CLRSupport>false</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CLRSupport>false</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CLRSupport>false</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CLRSupport>false</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

model_efdc_dll/.gitignore

@@ -0,0 +1,10 @@
+*genmod.*
+*.obj
+*.mod
+*.lib
+*.exp
+*.u2d
+*.pdb
+*.manifest*
+
+BuildLog.htm

model_efdc_dll/documentation.md

@@ -57,14 +57,27 @@ C73 ISVPH NPVPH ISRVPH IVPHXY
 
 ## Restart files
 
-Input
+| Input  | Output | 
+| ------ | ---- |
+| RESTART.INP | RESTART.OUT |
+| RSTWD.INP |  RSTWD.OUT |
+| TEMP.RST | TEMP.RSTO  |
+| WQWCRST.INP | TEMP.RSTO |
+
+## Run time period
+
+| Template file              | EFDC file       | Keyword  |
+| -------------------------- | ------------------------ | ---- |
+| `EFDC_TEMPLATE.INP`            |`EFDC.INP`  | `C7` `$N_REF_PERIODS$` |
+| `EFDC_TEMPLATE.INP`          | `EFDC.INP`             | `C8` `$RELATIVE_TSTART$` (`TCON` must be 86400) |
+| `TOX_EVENT2_TEMPLATE.INP`    | `TOX_EVENT2.INP`       | `$TSTART$` `$TSTOP$` |          
+
+### Logging
+
+| File  | Content |
+| ----- | ------- |
+| `model.log` | Initialisation of dll, displays exchange items supported by current EFDC configuration  |
+| `instance001.log` | Per instance log, logs data exchange with exchange item id for times and values, compute steps, etc. |
 
-```
-RESTART.INP, RSTWD.INP, TEMP.RST,  WQWCRST.INP
-```
 
-Output
 
-```
-RESTART.OUT, RSTWD.OUT, TEMP.RSTO, WQWCRST.OUT
-```

model_efdc_dll/native/efdc_fortran_dll/.gitignore

@@ -0,0 +1 @@
+x64/

model_efdc_dll/native/efdc_fortran_dll/openDA_wrapper/model_cser_time_series.f90

@@ -222,7 +222,7 @@ function enlarge_cser_time_series(id,size_n,size_k,size_m) result(ret_val)
     if ((size_n > csert(id)%NDCSER)) then 
 
        !reallocate instance memory
-       if (debug) print*, "enlarge_cser_time_series", id, n, m 
+       if (debug) print*, "enlarge_cser_time_series", id, n, m , k
        if (debug) print*, "enlarge_cser_time_series", id, size_n, size_m, size_k 
 
        allocate(csert_new%MCSER(new_m,NSTVM))
@@ -282,6 +282,7 @@ function enlarge_cser_time_series(id,size_n,size_k,size_m) result(ret_val)
           CSER(1:n,1:k,1:m,:)= CSER_orig
 
           deallocate(TCSER_orig, CSER_orig)
+          ndcser_max= NDCSER
 
           !ALLOCATE(CSERT_EFDC(KCM,0:NCSERM,NSTVM))
           !ALLOCATE(MCTLAST(NCSERM,NSTVM))

model_efdc_dll/native/efdc_fortran_dll/openDA_wrapper/model_init.f90

@@ -1,20 +1,23 @@
 subroutine model_init
 
   use global
+  use mpi
 
   ! arguments
   !real, intent(out) :: time_period
 
   ! local
   CHARACTER(len=80) :: TITLE
 
-  call model_init_1
+  call model_init_1  ! opens output files
 
   ! **  CALL INPUT SUBROUTINE
   CALL VARINIT
 
   CALL INPUT(TITLE)
 
+  CALL MPI_DECOMPOSITION
+
   call model_init_2
 
   ! **  READ RESTART CONDITIONS OR INITIALIZE SCALAR FIELDS  

model_efdc_dll/native/efdc_fortran_dll/openDA_wrapper/model_init_2.for

@@ -184,6 +184,7 @@ C **  DXDJ
 
       use omp_lib
       USE GLOBAL
+      USE MPI
 
 
 
@@ -1009,7 +1010,7 @@ C
 C  
 C **  SET BOUNDARY CONDITION SWITCHES  
 C  
-      CALL SETBCS  
+      CALL SETBCS_mpi
 C  
 C **  CALCUATE CURVATURE METRICS (NEW ADDITION)  
 C  

model_efdc_dll/native/efdc_fortran_dll/openDA_wrapper/model_init_3.for

@@ -714,15 +714,7 @@ C
 C  
 C **  INITIALIZE BUOYANCY AND EQUATION OF STATE  
 C  
-!$OMP PARALLEL DO PRIVATE(LF,LL)
-
-      do ithds=0,nthds-1
-         LF=jse(1,ithds)
-         LL=jse(2,ithds)
-c
-         CALL CALBUOY(LF,LL)
-c
-      enddo   
+      CALL CALBUOY_mpi
 C  
 C **  INITIALIZE SFL IF(ISRESTI.EQ.0.AND ISTRAN(4).GE.1)  
 C  
@@ -994,7 +986,7 @@ C
       ENDIF  
  5300 FORMAT('   M    BELSURF     ASURFEL     ',  
      &    '   VOLSEL',/)  
- 5301 FORMAT(1X,I3,2X,F10.5,2X,E12.4,2X,E12.4)  
+ 5301 FORMAT(1X,I4,2X,F10.5,2X,E12.4,2X,E12.4)  
  5302 FORMAT(/)  
  5303 FORMAT(2X,F10.5,3(2X,E12.4))  
 C  
@@ -1090,7 +1082,7 @@ C
 C **  SMOOTH INITIAL SALINITY  
 C  
       IF(NSBMAX.GE.1)THEN  
-        CALL SALTSMTH  
+        CALL SALTSMTH_mpi
       ENDIF  
 C  
 C **  OUTPUT INITIAL DEPTH AND SALINITY FIELDS  
@@ -1131,12 +1123,16 @@ C
 C  
 C **  INITIALIZE EFDC EXPLORER OUTPUT  
 C  
-      IF(ISSPH(8).EQ.1.OR.ISBEXP.EQ.1) CALL EEXPOUT(1)  
+      IF(IBIN_TYPE.EQ.1)THEN
+          IF(ISSPH(8).EQ.1.OR.ISBEXP.EQ.1) CALL EEXPOUT_mpi(1)  
+      ELSEIF(IBIN_TYPE.EQ.0)THEN
+          IF(ISSPH(8).EQ.1.OR.ISBEXP.EQ.1) CALL EEXPOUT_opt_mpi(1)
+      ENDIF
 ! { GEOSR WRITE HYDRO FIELD FOR WQ ALONE : JGCHO 2010.11.10
 C **  INITIALIZE EFDC HYDRO DISTRIBUTION OUTPUT  
-      IF(ISRESTO.LT.-20)THEN
-        CALL RESTOUT(-20)
-      ENDIF
+!     IF(ISRESTO.LT.-20)THEN
+!       CALL RESTOUT(-20)
+!     ENDIF
 ! } GEOSR WRITE HYDRO FIELD FOR WQ ALONE : JGCHO 2010.11.10
 
       END SUBROUTINE model_init_3

model_efdc_dll/native/efdc_fortran_dll/openDA_wrapper/model_make_step.f90

@@ -17,8 +17,8 @@ subroutine model_make_step(time_period)
     write(*,'(A,F8.4,A,F6.1,A)') "time integration with HDMT from day ", TBEGIN, ' over ', time_period / 60.0, ' minutes'
     CALL HDMT
 elseif (IS2TIM.GE.1) then
-    write(*,'(A,F8.4,A,F6.1,A)') "time integration with HDMT2T from day ", TBEGIN, ' over ', time_period / 60.0, ' minutes'
-    CALL HDMT2T
+    write(*,'(A,F8.4,A,F6.1,A)') "time integration with HDMT2T_mpi from day ", TBEGIN, ' over ', time_period / 60.0, ' minutes'
+    CALL HDMT2T_mpi
 end if
 
 end subroutine model_make_step

model_efdc_dll/native/efdc_fortran_dll/openDA_wrapper/model_state.f90

@@ -534,6 +534,7 @@ function model_set_state(id) result(ret_val)
          WQV, WQVX,&
          ISRESTI, TIMEDAY, NXSP
     use model_extra_global
+    use mpi
 
     implicit none
 
@@ -552,6 +553,8 @@ function model_set_state(id) result(ret_val)
 
     call INPUT(TITLE)
 
+    call MPI_DECOMPOSITION
+
     call model_init_2
 
     ! Act like this is a restart