Changeset 3840 for palm/trunk/SOURCE

Timestamp:

Mar 29, 2019 10:35:52 AM (5 years ago)

Author:

knoop

Message:

Moved ocean_prognostic_equations calls into module_interface

Location:

palm/trunk/SOURCE

Files:

• module_interface.f90 (modified) (3 diffs)
• prognostic_equations.f90 (modified) (3 diffs)

palm/trunk/SOURCE/module_interface.f90

@@ -240 +240 @@
                ocean_init,                                                     &
                ocean_header,                                                   &
+               ocean_prognostic_equations,                                     &
                ocean_swap_timelevel,                                           &
                ocean_3d_data_averaging,                                        &
@@ -907 +908 @@
 
     IF ( gust_module_enabled )  CALL gust_prognostic_equations()
+    IF ( ocean_mode          )  CALL ocean_prognostic_equations()
 
 
@@ -927 +929 @@
 
     IF ( gust_module_enabled )  CALL gust_prognostic_equations( i, j, i_omp_start, tn )
+    IF ( ocean_mode          )  CALL ocean_prognostic_equations( i, j, i_omp_start, tn )
 
 

palm/trunk/SOURCE/prognostic_equations.f90

@@ -436 +436 @@
 
     USE ocean_mod,                                                             &
-        ONLY:  ocean_prognostic_equations, stokes_drift_terms, stokes_force,   &
+        ONLY:  stokes_drift_terms, stokes_force,   &
                wave_breaking, wave_breaking_term
 
@@ -1444 +1444 @@
           
           ENDIF   ! Chemical equations
-!
-!--       Calculate prognostic equations for the ocean
-          IF ( ocean_mode )  THEN
-             CALL ocean_prognostic_equations( i, j, i_omp_start, tn )
-          ENDIF
        
           IF ( salsa )  THEN 
@@ -2703 +2698 @@
        
        CALL cpu_log( log_point_s(92), 'salsa advec+diff+prog ', 'stop' )
-    ENDIF  
-
-!
-!-- Calculate prognostic equations for the ocean
-    IF ( ocean_mode )  CALL ocean_prognostic_equations()
+    ENDIF
+
 
  END SUBROUTINE prognostic_equations_vector