Changeset 13204 for utils/tools/DOMAINcfg/src/domhgr.F90

Timestamp:

2020-07-02T10:38:35+02:00 (4 years ago)

Author:

smasson

Message:

tools: update with tools_dev_r12970_AGRIF_CMEMS

File:

• utils/tools/DOMAINcfg/src/domhgr.F90 (modified) (5 diffs)

utils/tools/DOMAINcfg/src/domhgr.F90

@@ -286 +286 @@
          gphi0 = zphi1 + zsin_alpha * ze1deg * REAL( jpjglo-2 , wp )
          !
-         IF( nprint==1 .AND. lwp )   THEN
-            WRITE(numout,*) '          ze1', ze1, 'cosalpha', zcos_alpha, 'sinalpha', zsin_alpha
-            WRITE(numout,*) '          ze1deg', ze1deg, 'glam0', glam0, 'gphi0', gphi0
-         ENDIF
+    !        WRITE(numout,*) '          ze1', ze1, 'cosalpha', zcos_alpha, 'sinalpha', zsin_alpha
+    !        WRITE(numout,*) '          ze1deg', ze1deg, 'glam0', glam0, 'gphi0', gphi0
          !
          DO jj = 1, jpj
@@ -343 +341 @@
       e1_e2v(:,:) = e1v(:,:) / e2v(:,:)
 
-      IF( lwp .AND. nn_print >=1 .AND. .NOT.ln_rstart ) THEN      ! Control print : Grid informations (if not restart)
+      IF( lwp ) THEN      ! Control print : Grid informations (if not restart)
          WRITE(numout,*)
          WRITE(numout,*) '          longitude and e1 scale factors'
@@ -434 +432 @@
       ! ------------------------------------------
       ! The equator line must be the latitude coordinate axe
-! (PM) be carefull with nperio/jperio 
+ !(PM) be carefull with nperio/jperio 
       IF( jperio == 2 ) THEN
          znorme = SQRT( SUM( gphiu(:,2) * gphiu(:,2) ) ) / REAL( jpi )
@@ -455 +453 @@
       !
       INTEGER ::   inum   ! temporary logical unit
+      CHARACTER(LEN=135) :: coordinate_filename
       !!----------------------------------------------------------------------
       !
@@ -463 +462 @@
       ENDIF
       !
-      CALL iom_open( 'coordinates', inum )
+      IF (ln_read_cfg) THEN
+         coordinate_filename=TRIM(cn_domcfg)
+      ELSE
+         coordinate_filename='coordinates'
+      ENDIF
+      CALL iom_open( coordinate_filename, inum )
       !
       CALL iom_get( inum, jpdom_data, 'glamt', glamt, lrowattr=ln_use_jattr )