Changeset 7766 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsms_medusa.F90

Timestamp:

2017-03-07T19:30:03+01:00 (7 years ago)

Author:

jpalmier

Message:

JPALM -- adapted MEDUSA_SBC to coupled mode, and merged this branch with RICHARD s fixes_part2 branch

File:

• branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsms_medusa.F90 (modified) (3 diffs)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsms_medusa.F90

@@ -58 +58 @@
       ENDIF
 
-      CALL trc_avg_medusa( kt )   ! rolling average module
+      CALL trc_avg_medusa( kt ) ! rolling average module
 # if defined key_debug_medusa
-         IF(lwp) WRITE(numout,*) ' MEDUSA done trc_avg_medusa'
-         CALL flush(numout)
+      IF(lwp) WRITE(numout,*) ' MEDUSA done trc_avg_medusa'
+      CALL flush(numout)
+# endif
+      
+      CALL trc_opt_medusa( kt ) ! optical model
+# if defined key_debug_medusa
+      IF(lwp) WRITE(numout,*) ' MEDUSA done trc_opt_medusa'
+      CALL flush(numout)
 # endif
 
-      CALL trc_opt_medusa( kt )   ! optical model
+      !! AXY & JPALM (28/02/17): call dust before trc_bio_medusa (because of coupling)
+      CALL trc_sed_medusa_dust( kt ) ! dust submodel
 # if defined key_debug_medusa
-         IF(lwp) WRITE(numout,*) ' MEDUSA done trc_opt_medusa'
-         CALL flush(numout)
+      IF(lwp) WRITE(numout,*) ' MEDUSA done trc_sed_medusa_dust'
+      CALL flush(numout)
 # endif
 
@@ -75 +82 @@
       CALL flush(numout)
 # else
-      CALL trc_bio_medusa( kt )   ! biological model
-# if defined key_debug_medusa
-         IF(lwp) WRITE(numout,*) ' MEDUSA done trc_bio_medusa'
-         CALL flush(numout)
-# endif
-
-      CALL trc_sed_medusa( kt )   ! sedimentation model
-# if defined key_debug_medusa
-         IF(lwp) WRITE(numout,*) ' MEDUSA done trc_sed_medusa'
-         CALL flush(numout)
-# endif
+      CALL trc_bio_medusa( kt ) ! biological model
+#  if defined key_debug_medusa
+      IF(lwp) WRITE(numout,*) ' MEDUSA done trc_bio_medusa'
+      CALL flush(numout)
+#  endif
+      
+      CALL trc_sed_medusa( kt ) ! sedimentation model
+#  if defined key_debug_medusa
+      IF(lwp) WRITE(numout,*) ' MEDUSA done trc_sed_medusa'
+      CALL flush(numout)
+#  endif
 # endif
 
@@ -103 +110 @@
    !!======================================================================
 END MODULE trcsms_medusa
+