Changeset 2391

Timestamp:

Nov 10, 2015, 9:51:52 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Fix some minor anomalies spotted by the xlf compiler:

• infotrac : wrongly giving integer values to logicals
• surf_ocean_mod and yamada_c : should be a space between "stop" and message; but avoid using stop, use abort_physic routine instead.
• readchlorophyll: using isnan() is not standard; compare the variable to itself instead (will return .false. if NaN).

While at it, also added some missing "only" clauses when using modules.

EM

Location:

LMDZ5/trunk/libf

Files:

• dyn3d_common/infotrac.F90 (modified) (2 diffs)
• phylmd/readchlorophyll.F90 (modified) (4 diffs)
• phylmd/surf_ocean_mod.F90 (modified) (3 diffs)
• phylmd/yamada_c.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/dyn3d_common/infotrac.F90

@@ -59 +59 @@
 
   SUBROUTINE infotrac_init
-    USE control_mod
+    USE control_mod, ONLY: planet_type, config_inca
 #ifdef REPROBUS
     USE CHEM_REP, ONLY : Init_chem_rep_trac
@@ -276 +276 @@
              ! Y-a-t-il 1 ou 2 noms de traceurs? -> On regarde s'il y a un
              ! espace ou pas au milieu de la chaine.
-             continu=1
-             nouveau_traceurdef=0
+             continu=.true.
+             nouveau_traceurdef=.false.
              iiq=1
              do while (continu)
                 if (tchaine(iiq:iiq).eq.' ') then
-                  nouveau_traceurdef=1
-                  continu=0
+                  nouveau_traceurdef=.true.
+                  continu=.false.
                 else if (iiq.lt.LEN_TRIM(tchaine)) then
                   iiq=iiq+1
                 else
-                  continu=0      
+                  continu=.false.
                 endif
              enddo

LMDZ5/trunk/libf/phylmd/readchlorophyll.F90

@@ -13 +13 @@
                                  grid2dto1d_glo
     USE mod_phys_lmdz_mpi_data, ONLY :  is_mpi_root
-    USE mod_phys_lmdz_para 
-    USE phys_state_var_mod
-    USE phys_local_var_mod
-    USE dimphy
+    USE mod_phys_lmdz_para, ONLY: scatter 
+    USE phys_state_var_mod, ONLY: chl_con
 
     implicit none
@@ -93 +91 @@
     CALL nf95_inq_varid(ncid_in, "CHL", varid)
     ncerr = nf90_get_var(ncid_in, varid, chlorocon)
-    print *,'code erreur readaerosolstrato=', ncerr, varid
+    print *,'code erreur readchlorophyll=', ncerr, varid
 
     CALL nf95_close(ncid_in)
@@ -99 +97 @@
 !---select the correct month
     IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
-      print *,'probleme avec le mois dans readaerosolstrat =', mth_cur
+      print *,'probleme avec le mois dans readchlorophyll =', mth_cur
     ENDIF
     chlorocon_mois(:,:) = chlorocon(:,:,mth_cur)
@@ -109 +107 @@
     print*,"chrolophyll current month",mth_cur
     do i=1,klon_glo
-      if(isnan(chlorocon_mois_glo(i)))then
+!      if(isnan(chlorocon_mois_glo(i)))then ! isnan() is not in the Fortran standard...
+!      Another way to check for NaN:
+       if(chlorocon_mois_glo(i).ne.chlorocon_mois_glo(i)) then
          chlorocon_mois_glo(i)=0.
       endif

LMDZ5/trunk/libf/phylmd/surf_ocean_mod.F90

@@ -21 +21 @@
 
   use albedo, only: alboc, alboc_cd
-  USE dimphy
+  USE dimphy, ONLY: klon, zmasq
   USE surface_data, ONLY     : type_ocean
   USE ocean_forced_mod, ONLY : ocean_forced_noice
   USE ocean_slab_mod, ONLY   : ocean_slab_noice
   USE ocean_cpl_mod, ONLY    : ocean_cpl_noice
-  USE indice_sol_mod
+  USE indice_sol_mod, ONLY : nbsrf, is_oce
 !
 ! This subroutine will make a call to ocean_XXX_noice according to the ocean mode (force, 
@@ -92 +92 @@
     REAL, DIMENSION(klon) :: radsol
     REAL, DIMENSION(klon) :: cdragq ! Cdrag pour l'evaporation
+    CHARACTER(len=20),PARAMETER :: modname="surf_ocean"
 
 ! End definition
@@ -217 +218 @@
     ENDDO
 ELSE
-       STOP'version non prevue'
+       CALL abort_physic(modname,'version non prevue',1)
 ENDIF
 !

LMDZ5/trunk/libf/phylmd/yamada_c.F90

@@ -5 +5 @@
      &   ,pu,pv,pt,d_u,d_v,d_t,cd,q2,km,kn,kq,d_t_diss,ustar &
      &   ,iflag_pbl,okiophys)
-      use dimphy
+      USE dimphy, ONLY: klon, klev
       USE print_control_mod, ONLY: prt_level
       IMPLICIT NONE
@@ -113 +113 @@
       real w2yam(klon,klev),t2yam(klon,klev)
       logical,save :: firstcall=.true.
-
+!$OMP THREADPRIVATE(firstcall)       
+      CHARACTER(len=20),PARAMETER :: modname="yamada_c"
 REAL, DIMENSION(klon,klev+1) :: fluxu,fluxv,fluxt
 REAL, DIMENSION(klon,klev+1) :: dddu,dddv,dddt
@@ -119 +120 @@
 REAL, DIMENSION(klon,klev+1) :: masseb,q2old,q2neg
 
-!$OMP THREADPRIVATE(firstcall)       
       frif(ri)=0.6588*(ri+0.1776-sqrt(ri*ri-0.3221*ri+0.03156))
       falpha(ri)=1.318*(0.2231-ri)/(0.2341-ri)
@@ -571 +571 @@
 
       else
-         stop'Cas nom prevu dans yamada4'
+         CALL abort_physic(modname,'Cas nom prevu dans yamada4',1)
 
       endif ! Fin du cas 8