Changeset 5779 for branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.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/DOM/domzgr.F90 (modified) (4 diffs)

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

@@ -472 +472 @@
          risfdep(:,:)=0.e0
          misfdep(:,:)=1
-         !
-         ! (ISF) TODO build ice draft netcdf file for isomip and build the corresponding part of code
-         IF( cp_cfg == "isomip" .AND. ln_isfcav ) THEN 
-            risfdep(:,:)=200.e0 
-            misfdep(:,:)=1 
-            ij0 = 1 ; ij1 = 40 
-            DO jj = mj0(ij0), mj1(ij1) 
-               risfdep(:,jj)=700.0_wp-(gphit(:,jj)+80.0_wp)*125.0_wp 
-            END DO 
-            WHERE( bathy(:,:) <= 0._wp )  risfdep(:,:) = 0._wp 
-         ! 
-         ELSEIF ( cp_cfg == "isomip2" .AND. ln_isfcav ) THEN
-         ! 
-            risfdep(:,:)=0.e0
-            misfdep(:,:)=1
-            ij0 = 1 ; ij1 = 40
-            DO jj = mj0(ij0), mj1(ij1)
-               risfdep(:,jj)=700.0_wp-(gphit(:,jj)+80.0_wp)*125.0_wp
-            END DO
-            WHERE( bathy(:,:) <= 0._wp )  risfdep(:,:) = 0._wp
-         END IF
          !
          DEALLOCATE( idta, zdta )
@@ -549 +528 @@
                CALL iom_close( inum )
                WHERE( bathy(:,:) <= 0._wp )  risfdep(:,:) = 0._wp
+
+               ! set grounded point to 0 (treshold at 1cm, have to be update after first coupling experience)
+               WHERE (bathy(:,:) .LE. risfdep(:,:)+1e-2 )
+                  misfdep(:,:) = 0 ; risfdep(:,:) = 0._wp
+                  mbathy (:,:) = 0 ; bathy  (:,:) = 0._wp
+               END WHERE
             END IF
-            ! set grounded point to 0
-            WHERE (bathy(:,:) .LE. risfdep(:,:)+1e-2 )
-               misfdep(:,:) = 0 ; risfdep(:,:) = 0._wp
-               mbathy (:,:) = 0 ; bathy  (:,:) = 0._wp
-            END WHERE
             !       
             IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN    ! ORCA R2 configuration
@@ -1260 +1240 @@
       END WHERE  
 
-      ! set grounded point to 0
-      WHERE (bathy(:,:) .LE. risfdep(:,:)+1e-2 )
-         misfdep(:,:) = 0 ; risfdep(:,:) = 0._wp
-         mbathy (:,:) = 0 ; bathy  (:,:) = 0._wp
-      END WHERE
-
       ! Compute misfdep for ocean points (i.e. first wet level) 
       ! find the first ocean level such that the first level thickness 
@@ -1278 +1252 @@
       END WHERE
 
-      ! remove very shallow ice shelf (less than ~ 10m if 75L)
-      IF ( cp_cfg .NE. "isomip" ) THEN
-         WHERE (risfdep(:,:) < 100 )
-            misfdep = 1; risfdep = 0.0_wp;
-         END WHERE
-      END IF
- 
 ! basic check for the compatibility of bathy and risfdep. I think it should be offline because it is not perfect and cannot solved all the situation
       icompt = 0 
 ! run the bathy check 10 times to be sure all the modif in the bathy or iceshelf draft are compatible together
       DO jl = 1, 10     
+         ! check at each iteration if isf is grounded or not (1cm treshold have to be update after first coupling experiments)
          WHERE (bathy(:,:) .LE. risfdep(:,:)+1e-2 )
             misfdep(:,:) = 0 ; risfdep(:,:) = 0._wp