Changeset 5326 for LMDZ6/trunk/libf

Timestamp:

Nov 14, 2024, 11:53:17 AM (4 weeks ago)

Author:

abarral

Message:

Turn condsurfs_new.f90 into module
Add own handle_err subroutine to condsurfs_new_mod.f90 phytracr_spl_mod.F90, as they were using incorrectly the one from grilles_gcm_netcdf_sub

Location:

LMDZ6/trunk/libf

Files:

• phylmd/Dust/condsurfs_new_mod.f90 (moved) (moved from LMDZ6/trunk/libf/phylmd/Dust/condsurfs_new.f90) (2 diffs)
• phylmd/Dust/phytracr_spl_mod.F90 (modified) (2 diffs)
• phylmd/Dust/read_newemissions.f90 (modified) (1 diff)
• phylmd/physiq_mod.F90 (modified) (1 diff)
• phylmdiso/physiq_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/Dust/condsurfs_new_mod.f90

@@ +1 @@
+MODULE condsurfs_new_mod
+  IMPLICIT NONE; PRIVATE
+  PUBLIC condsurfs_new
+
+CONTAINS
+
+  SUBROUTINE handle_err(status)
+    USE netcdf, ONLY: nf90_noerr, nf90_strerror
+    IMPLICIT NONE
+
+    INTEGER status
+    IF (status/=nf90_noerr) THEN
+      PRINT *, nf90_strerror(status)
+      CALL abort_gcm('condsurfs_new', 'netcdf error', 1)
+    ENDIF
+  END SUBROUTINE handle_err
+
 SUBROUTINE condsurfs_new(jour, edgar, flag_dms, &
         lmt_so2b, lmt_so2h, lmt_so2nff, &
@@ -273 +290 @@
   RETURN
 END SUBROUTINE condsurfs_new
+
+
+END MODULE condsurfs_new_mod

LMDZ6/trunk/libf/phylmd/Dust/phytracr_spl_mod.F90

@@ -9 +9 @@
   USE chem_spla_mod_h
 
+  IMPLICIT NONE
+  PRIVATE handle_err
+
   REAL,SAVE  :: scale_param_ssacc  !Scaling parameter for Fine Sea Salt
   REAL,SAVE ::  scale_param_sscoa  !Scaling parameter for Coarse Sea Salt
-
-
 
   REAL, DIMENSION(:),ALLOCATABLE,SAVE :: scale_param_ind !Scaling parameter for industrial emissions of SO2
@@ -426 +427 @@
 
 CONTAINS
-!
+
+  SUBROUTINE handle_err(status)
+    USE netcdf, ONLY: nf90_noerr, nf90_strerror
+    IMPLICIT NONE
+
+    INTEGER status
+    IF (status/=nf90_noerr) THEN
+      PRINT *, nf90_strerror(status)
+      CALL abort_gcm('phytrac_spl_mod', 'netcdf error', 1)
+    ENDIF
+  END SUBROUTINE handle_err
+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 SUBROUTINE phytracr_spl_out_init()

LMDZ6/trunk/libf/phylmd/Dust/read_newemissions.f90

@@ -26 +26 @@
 
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
-USE paramet_mod_h
+  USE paramet_mod_h
+  USE condsurfs_new_mod, ONLY: condsurfs_new
 IMPLICIT NONE
 

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -369 +369 @@
        USE radopt_mod_h
        USE regdim_mod_h
+       USE phys_output_write_spl_mod, ONLY: phys_output_write_spl
+       USE phytracr_spl_mod, ONLY: phytracr_spl_out_init, phytracr_spl
     IMPLICIT NONE
     !>======================================================================

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -101 +101 @@
 !
     USE phytracr_spl_mod, ONLY: phytracr_spl, phytracr_spl_out_init
-    USE phys_output_write_spl_mod
+    USE phys_output_write_spl_mod, ONLY: phys_output_write_spl
     USE phytrac_mod, ONLY : phytrac_init, phytrac
     USE phys_output_write_mod