Changeset 12077 for NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/ISF/isfload.F90

Timestamp:

2019-12-05T18:41:39+01:00 (4 years ago)

Author:

mathiot

Message:

include ENHANCE-02_ISF_nemo in UKMO merge branch

File:

• NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/ISF/isfload.F90 (modified) (5 diffs)

NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/ISF/isfload.F90

@@ -11 +11 @@
    !!----------------------------------------------------------------------
 
-   USE isf, ONLY: cn_isfload   ! ice shelf variables
+   USE isf_oce, ONLY: cn_isfload, rn_isfload_T, rn_isfload_S ! ice shelf variables
 
    USE dom_oce, ONLY: e3w, gdept, risfdep, mikt     ! vertical scale factor
    USE eosbn2 , ONLY: eos                           ! eos routine
 
-   USE lib_mpp, ONLY: ctl_stop ! ctl_stop routine
-   USE in_out_manager  ! 
+   USE lib_mpp, ONLY: ctl_stop                               ! ctl_stop routine
+   USE in_out_manager                                        ! 
 
    IMPLICIT NONE
@@ -45 +45 @@
       ! ice shelf cavity
       SELECT CASE ( cn_isfload )
-      CASE ( 'isomip' )
-         CALL isf_load_isomip ( Kmm, pisfload )
+      CASE ( 'uniform' )
+         CALL isf_load_uniform ( Kmm, pisfload )
       CASE DEFAULT
          CALL ctl_stop('STOP','method cn_isfload to compute ice shelf load does not exist (isomip), check your namelist')
@@ -53 +53 @@
    END SUBROUTINE isf_load
 
-   SUBROUTINE isf_load_isomip( Kmm, pisfload )
+   SUBROUTINE isf_load_uniform( Kmm, pisfload )
       !!--------------------------------------------------------------------
       !!                  ***  SUBROUTINE isf_load  ***
@@ -79 +79 @@
       znad = 1._wp                     !- To use density and not density anomaly
       !
-      !                                !- assume water displaced by the ice shelf is at T=-1.9 and S=34.4 (rude)
-      zts_top(:,:,jp_tem) = -1.9_wp   ;   zts_top(:,:,jp_sal) = 34.4_wp
+      !                                !- assume water displaced by the ice shelf is at T=rn_isfload_T and S=rn_isfload_S (rude)
+      zts_top(:,:,jp_tem) = rn_isfload_T   ;   zts_top(:,:,jp_sal) = rn_isfload_S
       !
       DO jk = 1, jpk                   !- compute density of the water displaced by the ice shelf 
@@ -113 +113 @@
       END DO
       !
-   END SUBROUTINE isf_load_isomip
+   END SUBROUTINE isf_load_uniform
 
 END MODULE isfload