Changeset 9019 for branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC

Timestamp:

2017-12-13T15:58:53+01:00 (6 years ago)

Author:

timgraham

Message:

Merge of dev_CNRS_2017 into branch

Location:

branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC

Files:

• usrdef_hgr.F90 (modified) (2 diffs)
• usrdef_sbc.F90 (modified) (1 diff)

branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90

@@ -68 +68 @@
       IF( nn_timing == 1 )  CALL timing_start('usr_def_hgr')
       !
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'usr_def_hgr : ISOMIP configuration'
-      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'usr_def_hgr : ISOMIP configuration'
+         WRITE(numout,*) '~~~~~~~~~~~'
+         WRITE(numout,*)
+         WRITE(numout,*) '   ===>>  geographical mesh on the sphere with regular grid-spacing'
+         WRITE(numout,*) '          given by rn_e1deg and rn_e2deg'
+      ENDIF
       !
-      !                       !==  grid point position  ==!   (in kilometers)
-
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) '          geographical mesh on the sphere with regular grid-spacing'
-      IF(lwp) WRITE(numout,*) '          given by rn_e1deg and rn_e2deg'
-
+      !                       !==  grid point position  ==!   (in degrees)
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -94 +94 @@
             pphiv(ji,jj) = rn_phi0 + rn_e2deg * zvj
             pphif(ji,jj) = rn_phi0 + rn_e2deg * zfj
+            
      !                       !==  Horizontal scale factors  ==!   (in meters)
      ! e1

branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_sbc.F90

@@ -17 +17 @@
    USE dom_oce         ! ocean space and time domain
    USE sbc_oce         ! Surface boundary condition: ocean fields
+   USE sbc_ice         ! Surface boundary condition: ice fields
    USE phycst          ! physical constants
    !