Changeset 3903 for trunk/LMDZ.MARS/libf/phymars/surfini_mod.F90

Timestamp:

Aug 22, 2025, 10:41:37 AM (4 months ago)

Author:

jbclement

Message:

Mars PCM:
Case 'icelocationmode = 5' (default) is corrected compared to r2884. Now it reads 'watercaptag' from "startfi.nc" in any circumstances, unless it is missing, in which case 'icelocationmode' is set to 4.
JBC

File:

• trunk/LMDZ.MARS/libf/phymars/surfini_mod.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/libf/phymars/surfini_mod.F90

@@ -2 +2 @@
 
 implicit none
+
+! There are 4 different modes for ice distribution:
+! icelocationmode = 1 ---> based on data from surface.nc
+! icelocationmode = 2 ---> directly predefined for GCM resolutions 32x24 or 64x48
+! icelocationmode = 3 ---> based on logical relations for latitude and longitude
+! icelocationmode = 4 ---> predefined 64x48 but usable with every
+! resolution, and easily adaptable for dynamico
+! For visualisation : > /u/tnalmd/bin/watercaps gcm_txt_output_file
+integer :: icelocationmode = 5
+
+!$OMP THREADPRIVATE(icelocationmode)
 
 !=======================================================================
@@ -45 +56 @@
       ! longwatercaptag is watercaptag. Trick for some compilers
       LOGICAL, DIMENSION(100000) :: longwatercaptag
-
-! There are 4 different modes for ice distribution:
-! icelocationmode = 1 ---> based on data from surface.nc
-! icelocationmode = 2 ---> directly predefined for GCM resolutions 32x24 or 64x48
-! icelocationmode = 3 ---> based on logical relations for latitude and longitude
-! icelocationmode = 4 ---> predefined 64x48 but usable with every
-! resolution, and easily adaptable for dynamico
-! For visualisation : > /u/tnalmd/bin/watercaps gcm_txt_output_file
-      INTEGER,SAVE :: icelocationmode = 5
-
-!$OMP THREADPRIVATE(icelocationmode)
-
 
       !in case icelocationmode == 1
@@ -449 +448 @@
          write(*,*)'icelocationmode = 5'
          write(*,*)'Surfini: ice caps defined using startfi.nc data'
-         do ig=1,ngrid
-           if(any(watercaptag_glo)) then
-           else
-              call locate_watercaptag(klon_glo,lati_glo,long_glo,watercaptag_glo)
-           endif
-         enddo
-
-!         write(*,*)'watercaptag_glo(:), ',watercaptag_glo(:)
 
             case default