Changeset 5952

Timestamp:

2015-11-30T13:16:21+01:00 (8 years ago)

Author:

mathiot

Message:

ice sheet coupling: minor changes before merge

Location:

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO

Files:

• OFF_SRC/domrea.F90 (modified) (1 diff)
• OPA_SRC/DOM/domzgr.F90 (modified) (1 diff)
• OPA_SRC/DOM/iscplrst.F90 (modified) (2 diffs)
• OPA_SRC/SBC/sbcisf.F90 (modified) (2 diffs)

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OFF_SRC/domrea.F90

@@ -123 +123 @@
          &             nn_it000, nn_itend  , nn_date0    , nn_leapy     , nn_istate , nn_stock ,   &
          &             nn_write, ln_iscpl, ln_dimgnnn, ln_mskland  , ln_cfmeta    , ln_clobber, nn_chunksz, nn_euler
-      NAMELIST/namdom/ nn_bathy , rn_bathy, rn_e3zps_min, rn_e3zps_rat, nn_msh    , rn_hmin,   &
+      NAMELIST/namdom/ nn_bathy , rn_bathy, rn_e3zps_min, rn_e3zps_rat, nn_msh    , rn_hmin, rn_isfhmin,  &
          &             nn_acc   , rn_atfp     , rn_rdt      , rn_rdtmin ,            &
          &             rn_rdtmax, rn_rdth     , nn_baro     , nn_closea , ln_crs, &

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -1272 +1272 @@
             mbathy(:,:)  = INT( zbathy(:,:) )
          ENDIF
-         ! JMM : lbc_lnk must do it ? no ???
          IF( nperio == 1 .OR. nperio  ==  4 .OR. nperio  ==  6 ) THEN 
             misfdep( 1 ,:) = misfdep(jpim1,:)            ! local domain is cyclic east-west 

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90

@@ -30 +30 @@
    
    PUBLIC   iscpl_stp          ! step management 
-   PUBLIC   iscpl_rst_interpol ! routine to wet and dry  ! JMM:  why PUBLIC, it is only called 
-                                                         ! from this module  from iscpl_stp, called from istate ??
    !!
    !! * Substitutions  
@@ -398 +396 @@
                      zdzm1 = MAX(0._wp,pdepw_b(ji,jj,jk  )  - fsdepw_n(ji,jj,jk  ))
                      IF (zdz .LT. 0._wp) THEN 
-!!!!JMM : numout must not be used without IF (lwp)
-                        IF ( lwp ) THEN
-                        WRITE(numout,*) 'ERROR dz n ', ji,jj,jk,zdz,fsdepw_n(ji,jj,jk+1),fsdepw_n(ji,jj,jk),fsdepw_n(ji,jj,jk-1)
-                        WRITE(numout,*) 'ERROR dz n             = ',fse3t_n (ji,jj,jk+1),fse3t_n (ji,jj,jk),fse3t_n (ji,jj,jk-1), sshn(ji,jj)
-                        WRITE(numout,*) 'ERROR dz b             = ',pdepw_b(ji,jj,jk+1),pdepw_b(ji,jj,jk),pdepw_b(ji,jj,jk-1)
-                        WRITE(numout,*) 'ERROR dz b             = ',fse3t_b (ji,jj,jk+1),fse3t_b (ji,jj,jk),fse3t_b (ji,jj,jk-1), sshb(ji,jj)
-                        WRITE(numout,*) 'ERROR dz 0             = ',  e3t_0 (ji,jj,jk+1),  e3t_0 (ji,jj,jk),  e3t_0 (ji,jj,jk-1)
-                        WRITE(numout,*) 'ERROR dz n             = ',  tmask (ji,jj,jk+1),  tmask (ji,jj,jk),  tmask (ji,jj,jk-1)
-                        WRITE(numout,*) 'ERROR dz n             = ', zwmaskn(ji,jj,jk+1), zwmaskn(ji,jj,jk), zwmaskn(ji,jj,jk-1)
-                        WRITE(numout,*) 'ERROR dz b             = ', ptmask_b(ji,jj,jk+1), ptmask_b(ji,jj,jk), ptmask_b(ji,jj,jk-1)
-                        WRITE(numout,*) 'ERROR dz b             = ', zwmaskb(ji,jj,jk+1), zwmaskb(ji,jj,jk), zwmaskb(ji,jj,jk-1)
-                        WRITE(numout,*) 'ERROR dz b             = ', gdepw_0(ji,jj,jk+1), gdepw_0(ji,jj,jk), gdepw_0(ji,jj,jk-1)
-                        ENDIF
                         CALL ctl_stop( 'STOP', 'rst_iscpl : unable to compute the interpolation' )
                      END IF

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

@@ -358 +358 @@
     IF ( nn_timing == 1 ) CALL timing_start('sbc_isf_bg03')
      !
-
-    ! This test is false only in the very first time step of a run (JMM ???- Initialy build to skip 1rst year of run )
     DO ji = 1, jpi
        DO jj = 1, jpj
@@ -368 +366 @@
     ! 3. -----------the average temperature between 200m and 600m ---------------------
              DO jk = misfkt(ji,jj),misfkb(ji,jj)
-             ! freezing point temperature  at ice shelf base BG eq. 2 (JMM sign pb ??? +7.64e-4 !!!)
-             ! after verif with UNESCO, wrong sign in BG eq. 2
              ! Calculate freezing temperature
-                zpress = grav*rau0*fsdept(ji,jj,ik)*1.e-04 
-                CALL eos_fzp(tsb(ji,jj,ik,jp_sal), zt_frz, zpress) 
+                CALL eos_fzp(tsb(ji,jj,ik,jp_sal), zt_frz, fsdept(ji,jj,ik)) 
                 zt_sum = zt_sum + (tsn(ji,jj,ik,jp_tem)-zt_frz) * fse3t(ji,jj,ik) * tmask(ji,jj,ik)  ! sum temp
              ENDDO