Changeset 2311 for LMDZ5/trunk/libf/phylmd/condsurf.F90

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

File:

• LMDZ5/trunk/libf/phylmd/condsurf.F90 (modified) (5 diffs)

LMDZ5/trunk/libf/phylmd/condsurf.F90

@@ -56 +56 @@
   IF (jour<0 .OR. jour>(360-1)) THEN
     PRINT *, 'Le jour demande n est pas correct: ', jour
-    CALL abort_gcm('condsurf', '', 1)
+    CALL abort_physic('condsurf', '', 1)
   END IF
 
@@ -76 +76 @@
     PRINT *, ' trouve pas sur les ', nannemax, ' annees a partir de '
     PRINT *, ' l annee de debut', annee_ref
-    CALL abort_gcm('condsurf', '', 1)
+    CALL abort_physic('condsurf', '', 1)
 
 100 CONTINUE
@@ -96 +96 @@
       WRITE (6, *) '       l an 2000 )  ,  n existe  pas !  '
       WRITE (6, *) ' ierr = ', ierr
-      CALL abort_gcm('condsurf', '', 1)
+      CALL abort_physic('condsurf', '', 1)
     END IF
     ! DO k = 1, jour
@@ -109 +109 @@
     ierr = nf_inq_varid(nid, 'BILS', nvarid)
     IF (ierr/=nf_noerr) THEN
-      CALL abort_gcm('cond_surf', 'Le champ <BILS> est absent', 1)
+      CALL abort_physic('cond_surf', 'Le champ <BILS> est absent', 1)
     END IF
     PRINT *, 'debut,epais', debut, epais, 'jour,jourvrai', jour, jourvrai
@@ -118 +118 @@
 #endif
     IF (ierr/=nf_noerr) THEN
-      CALL abort_gcm('condsurf', 'Lecture echouee pour <BILS>', 1)
+      CALL abort_physic('condsurf', 'Lecture echouee pour <BILS>', 1)
     END IF
     ! ENDDO !k = 1, jour