Changeset 2311 for LMDZ5/trunk/libf/dynlonlat_phylonlat

Timestamp:

Jun 25, 2015, 9:45:24 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Further modifications to enforce physics/dynamics separation:

• moved iniprint.h and misc_mod back to dyn3d_common, as these should only be used by dynamics.
• created print_control_mod in the physics to store flags prt_level, lunout, debug to be local to physics (should be used rather than iniprint.h)
• created abort_physic.F90 , which does the same job as abort_gcm() did, but should be used instead when in physics.
• reactivated inifis (turned it into a module, inifis_mod.F90) to initialize physical constants and print_control_mod flags.

EM

Location:

LMDZ5/trunk/libf/dynlonlat_phylonlat

Files:

• phydev/iniphysiq.F90 (modified) (3 diffs)
• phylmd/iniphysiq.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/dynlonlat_phylonlat/phydev/iniphysiq.F90

@@ -18 +18 @@
                         rlond, & ! longitudes
                         rlatd ! latitudes
-  USE comcstphy, ONLY: rradius, & ! planet radius (m)
-                       rr, & ! recuced gas constant: R/molar mass of atm
-                       rg, & ! gravity
-                       rcpp  ! specific heat of the atmosphere
+!  USE comcstphy, ONLY: rradius, & ! planet radius (m)
+!                       rr, & ! recuced gas constant: R/molar mass of atm
+!                       rg, & ! gravity
+!                       rcpp  ! specific heat of the atmosphere
+  USE inifis_mod, ONLY: inifis
   USE phyaqua_mod, ONLY: iniaqua
   IMPLICIT NONE
@@ -119 +120 @@
 
 !$OMP PARALLEL 
+  ! Initialize physical constants in physics:
+  CALL inifis(prad,pg,pr,pcpp)
+
   ! Now generate local lon/lat/cu/cv/area arrays
   CALL initcomgeomphy
@@ -129 +133 @@
   rlatd(1:klon_omp) = latfi(offset+klon_omp_begin:offset+klon_omp_end)
 
-  ! copy some fundamental parameters to physics
-  rradius=prad
-  rg=pg
-  rr=pr
-  rcpp=pcpp
-
-!$OMP END PARALLEL
-
   ! Additional initializations for aquaplanets 
-!$OMP PARALLEL
   IF (iflag_phys>=100) THEN
     CALL iniaqua(klon_omp,rlatd,rlond,iflag_phys)

LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/iniphysiq.F90

@@ -19 +19 @@
                         rlond, & ! longitudes
                         rlatd ! latitudes
+  USE inifis_mod, ONLY: inifis
   USE phyaqua_mod, ONLY: iniaqua
   IMPLICIT NONE
@@ -27 +28 @@
   ! =======================================================================
 
-  include "YOMCST.h"
   include "iniprint.h"
 
@@ -125 +125 @@
 
 !$OMP PARALLEL 
+  ! Initialize physical constants in physics:
+  CALL inifis(punjours,prad,pg,pr,pcpp)
+  
   ! Now generate local lon/lat/cu/cv/area arrays
   CALL initcomgeomphy
@@ -135 +138 @@
   rlatd(1:klon_omp) = latfi(offset+klon_omp_begin:offset+klon_omp_end)
 
-    ! suphel => initialize some physical constants (orbital parameters,
-    !           geoid, gravity, thermodynamical constants, etc.) in the
-    !           physics
-  CALL suphel
-
-!$OMP END PARALLEL
-
-  ! check that physical constants set in 'suphel' are coherent
-  ! with values set in the dynamics:
-  IF (rday/=punjours) THEN
-    WRITE (lunout, *) 'iniphysiq: length of day discrepancy!!!'
-    WRITE (lunout, *) '  in the dynamics punjours=', punjours
-    WRITE (lunout, *) '   but in the physics RDAY=', rday
-    IF (abs(rday-punjours)>0.01*punjours) THEN
-        ! stop here if the relative difference is more than 1%
-      abort_message = 'length of day discrepancy'
-      CALL abort_gcm(modname, abort_message, 1)
-    END IF
-  END IF
-  IF (rg/=pg) THEN
-    WRITE (lunout, *) 'iniphysiq: gravity discrepancy !!!'
-    WRITE (lunout, *) '     in the dynamics pg=', pg
-    WRITE (lunout, *) '  but in the physics RG=', rg
-    IF (abs(rg-pg)>0.01*pg) THEN
-        ! stop here if the relative difference is more than 1%
-      abort_message = 'gravity discrepancy'
-      CALL abort_gcm(modname, abort_message, 1)
-    END IF
-  END IF
-  IF (ra/=prad) THEN
-    WRITE (lunout, *) 'iniphysiq: planet radius discrepancy !!!'
-    WRITE (lunout, *) '   in the dynamics prad=', prad
-    WRITE (lunout, *) '  but in the physics RA=', ra
-    IF (abs(ra-prad)>0.01*prad) THEN
-        ! stop here if the relative difference is more than 1%
-      abort_message = 'planet radius discrepancy'
-      CALL abort_gcm(modname, abort_message, 1)
-    END IF
-  END IF
-  IF (rd/=pr) THEN
-    WRITE (lunout, *) 'iniphysiq: reduced gas constant discrepancy !!!'
-    WRITE (lunout, *) '     in the dynamics pr=', pr
-    WRITE (lunout, *) '  but in the physics RD=', rd
-    IF (abs(rd-pr)>0.01*pr) THEN
-        ! stop here if the relative difference is more than 1%
-      abort_message = 'reduced gas constant discrepancy'
-      CALL abort_gcm(modname, abort_message, 1)
-    END IF
-  END IF
-  IF (rcpd/=pcpp) THEN
-    WRITE (lunout, *) 'iniphysiq: specific heat discrepancy !!!'
-    WRITE (lunout, *) '     in the dynamics pcpp=', pcpp
-    WRITE (lunout, *) '  but in the physics RCPD=', rcpd
-    IF (abs(rcpd-pcpp)>0.01*pcpp) THEN
-        ! stop here if the relative difference is more than 1%
-      abort_message = 'specific heat discrepancy'
-      CALL abort_gcm(modname, abort_message, 1)
-    END IF
-  END IF
-
-  ! Additional initializations for aquaplanets
-!$OMP PARALLEL
+  ! Additional initializations for aquaplanets 
   IF (iflag_phys>=100) THEN
     CALL iniaqua(klon_omp, rlatd, rlond, iflag_phys)