Changeset 11494 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfparmlt.F90

Timestamp:

2019-09-03T12:46:35+02:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF: switch on isf param in WED025 and fix bugs in isf param code + cosmetic changes (ticket #2142)

File:

• NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfparmlt.F90 (modified) (6 diffs)

NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfparmlt.F90

@@ -37 +37 @@
 ! -------------------------------------------------------------------------------------------------------
 
-  SUBROUTINE isfpar_mlt( kt, pqfwf, pqoce, pqhc )
-      !!---------------------------------------------------------------------
-      !!                  ***  ROUTINE sbc_isf  ***
+  SUBROUTINE isfpar_mlt( kt, pqhc, pqoce, pqfwf )
+      !!---------------------------------------------------------------------
+      !!                  ***  ROUTINE isfpar_mlt  ***
       !!
       !! ** Purpose : Compute Salt and Heat fluxes related to ice_shelf 
@@ -49 +49 @@
       !!----------------------------------------------------------------------
       !!-------------------------- OUT -------------------------------------
-      REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) :: pqfwf,pqoce, pqhc  ! fresh water, ice-ocean heat and heat content fluxes
+      REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) :: pqfwf, pqoce, pqhc  ! fresh water, ice-ocean heat and heat content fluxes
       !!-------------------------- IN  -------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean time step
@@ -72 +72 @@
 ! -------------------------------------------------------------------------------------------------------
 
-   SUBROUTINE isfpar_mlt_spe(kt, pqhc, pqfwf, pqoce)
+   SUBROUTINE isfpar_mlt_spe(kt, pqhc, pqoce, pqfwf)
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE isfpar_mlt_spe  ***
@@ -81 +81 @@
       !!----------------------------------------------------------------------
       !!-------------------------- OUT -------------------------------------
-      REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) :: pqhc, pqfwf,pqoce  ! fresh water and ice-ocean heat fluxes
+      REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) :: pqhc, pqfwf, pqoce  ! fresh water and ice-ocean heat fluxes
       !!-------------------------- IN  -------------------------------------
       INTEGER,  INTENT(in) :: kt
@@ -122 +122 @@
       !!----------------------------------------------------------------------
       !!-------------------------- OUT -------------------------------------
-      REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) :: pqhc, pqfwf,pqoce  ! fresh water and ice-ocean heat fluxes
+      REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) :: pqhc, pqfwf, pqoce  ! fresh water and ice-ocean heat fluxes
       !!-------------------------- IN  -------------------------------------
       INTEGER,  INTENT(in) :: kt
@@ -158 +158 @@
    SUBROUTINE isfpar_mlt_oasis(kt, pqhc , pqoce, pqfwf )
       !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE isfpar_oasis  ***
       !!
       !! ** Purpose    : scale the fwf read from input file by the total amount received by the sbccpl interface
       !!
-      !! ** Purpose    : - read ice shelf melt from forcing file => pattern
-      !!                 - total amount of fwf is given by sbccpl (fwfisf_oasis)
+      !! ** Purpose    : - read ice shelf melt from forcing file and scale it by the input file total amount => pattern
+      !!                 - compute total amount of fwf given by sbccpl (fwfisf_oasis)
       !!                 - scale fwf and compute heat fluxes
       !!