Changeset 5779 for branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

Timestamp:

2015-10-06T18:28:13+02:00 (9 years ago)

Author:

mathiot

Message:

ISF coupling branch: correct some compilation issues, remove code related to MISOMIP/ISOMIP+ and polishing

File:

• branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (2 diffs)

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -22 +22 @@
    USE sbcrnf          ! River runoff  
    USE sbcisf          ! Ice shelf   
-   USE sbc_iscpl       ! Ice sheet coupling
+   USE iscplini       ! Ice sheet coupling
    USE traqsr          ! solar radiation penetration
    USE trd_oce         ! trends: ocean variables
@@ -291 +291 @@
       !----------------------------------------
       !
-      IF( ln_iscpl .AND. ln_hfb) THEN         ! input of heat and salt due to river runoff 
+      IF( ln_iscpl .AND. ln_hsb) THEN         ! input of heat and salt due to river runoff 
          DO jk = 1,jpk
             DO jj = 2, jpj